update 2023-02-20 08:38:49

2025-09-18 18:51:16 +08:00 · 2023-02-20 08:38:49 +08:00
parent 27590704d0
commit 71f4ced0cd
39 changed files with 1129 additions and 1241 deletions
--- a/luci-app-adguardhome/Makefile
+++ b/luci-app-adguardhome/Makefile
@ -1,35 +1,50 @@
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
+# Copyright (C) 2020-2023 Hyy2001X <https://github.com/Hyy2001X>

 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-adguardhome
-PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
+PKG_VERSION:=1.0
+PKG_RELEASE:=20230123

-LUCI_TITLE:=LuCI app for AdGuardHome
-LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome
-LUCI_DESCRIPTION:=LuCI support for AdGuardHome
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

+include $(INCLUDE_DIR)/package.mk

-define Package/$(PKG_NAME)/config
-config PACKAGE_$(PKG_NAME)_INCLUDE_binary
-	bool "Include Binary File"
-	default n
+define Package/luci-app-adguardhome
+	SECTION:=luci
+	CATEGORY:=LuCI
+	SUBMENU:=3. Applications
+	TITLE:=LuCI support for AdGuard Home [Modified by Hyy2001]
+	PKGARCH:=all
+	DEPENDS:=+!wget-ssl&&!curl:wget-ssl +xz-utils +xz
 endef

-PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary
+define Package/luci-app-adguardhome/description
+	LuCI support for AdGuard Home
+endef
+
+define Build/Prepare
+endef
+
+define Build/Compile
+endef

 define Package/luci-app-adguardhome/conffiles
 /usr/share/AdGuardHome/links.txt
 /etc/config/AdGuardHome
-/etc/AdGuardHome.yaml
 endef

+define Package/luci-app-adguardhome/install
+    $(INSTALL_DIR) $(1)/usr/lib/lua/luci
+	cp -pR ./luasrc/* $(1)/usr/lib/lua/luci
+	$(INSTALL_DIR) $(1)/
+	cp -pR ./root/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
+	po2lmo ./po/zh-cn/AdGuardHome.po $(1)/usr/lib/lua/luci/i18n/AdGuardHome.zh-cn.lmo
+endef

 define Package/luci-app-adguardhome/postinst
 #!/bin/sh
-	chmod 755 /usr/share/AdGuardHome/*
 	/etc/init.d/AdGuardHome enable >/dev/null 2>&1
 	enable=$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)
 	if [ "$enable" == "1" ]; then
@ -53,6 +68,4 @@ fi
 exit 0
 endef

-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
+$(eval $(call BuildPackage,luci-app-adguardhome))
--- a/luci-app-adguardhome/README.md
+++ b/luci-app-adguardhome/README.md
@ -1,93 +1,17 @@
 # luci-app-adguardhome
-复杂的AdGuardHome的openwrt的luci界面

- - 可以管理网页端口
- - luci下载/更新核心版本（支持自定义链接下载）
-   - 如果为tar.gz文件需要与官方的文件结构一致
-   - 或者直接为主程序二进制
- - upx 压缩核心（xz依赖，脚本自动下载，如果opkg源无法连接，请在编译时加入此包）
- - dns重定向
-   - 作为dnsmasq的上游服务器(在AGH中统计到的ip都为127.0.0.1，无法统计客户端及对应调整设置，ssr-plus正常)
-   - 重定向53端口到 AdGuardHome（ipv6需要开启ipv6 nat redirect 否则如果客户端使用ipv6过滤无效，不以dnsmasq为上游ssr-plus失效）
-   - 使用53端口替换 dnsmasq(需要设置AGH的dnsip为0.0.0.0, AGH和dnsmasq的端口将被交换，不以dnsmasq为上游ssr-plus失效)
- - 自定义执行文件路径（支持tmp，每次重启后自动下载bin）
- - 自定义配置文件路径
- - 自定义工作路径
- - 自定义运行日志路径
- - gfwlist 删除/添加/定义上游dns服务器 另外安利一下https://github.com/rufengsuixing/luci-app-autoipsetadder
- - 修改网页登陆密码
- - 倒序/正序 查看/删除/备份 每3秒更新显示运行日志 + 本地浏览器时区转换
- - 手动修改配置文件
-   - 支持yaml编辑器
-   - 模板快速配置
- - 系统升级保留勾选文件
- - 开机启动后当网络准备好时重启adh(3分钟超时，主要用于防止过滤器更新失败)
- - 关机时备份勾选的工作目录中的文件（须知：在ipk更新的时候也会触发备份）
- - 计划任务（以下为默认值，时间和参数可以在计划任务中调整）
-   - 自动更新核心（最好谨慎使用）(3:30/天)
-   - 自动截短查询日志 (每小时 限制到2000行)
-   - 自动截短运行日志（3:30/天 限制到2000行）
-   - 自动更新ipv6主机并重启adh （每小时，无更新不重启)
-   - 自动更新gfw列表并重启adh （3:30/天，无更新不重启)
-#### 已知问题：
- - db数据库不支持放在不支持mmap的文件系统上比如 jffs2 data-stk-oo，请修改工作目录，本软件如果检测到jffs2会自动ln(软连接)到/tmp，将会导致重启丢失dns数据库
- - AdGuardHome 不支持ipset 设置，在使用ipset的情况下，无法替代dnsmasq只能作为dnsmasq上游存在，如果你想要这个功能就去投票吧<br>
- https://github.com/AdguardTeam/AdGuardHome/issues/1191
- - 反馈出现大量127.0.0.1查询了localhost的请求，问题出现原因是ddns插件，如果不用ddns插件，请删除或者注释掉\etc\hotplug.d\iface\95-ddns的内容，如果还有其他来自本机的异常查询情况，高级玩家可以使用kmod来查找原因https://github.com/rufengsuixing/kmod-plog-port
- - 如果出现需要多次提交才有反应的现象请及时提交issue
-#### 使用方法
- - 下载release，使用opkg安装即可
- - 或者编译op时clone本项目加入软件包并勾选
-#### 关于压缩
-本着较真的想法，我测试了在jffs2的压缩文件系统上进行upx压缩结果的内存占用与空间占用(单位kb，使用最好压缩)<br>
-文件大小<br>
-源文件   14112 使用upx 压缩后 5309 <br>
-实际占用 6260  使用upx 压缩后 5324 差值为 936<br>
-VmRSS运存占用值<br>
-不压缩   14380 使用upx 压缩后 18496 差值 -4116 <br>
-对于压缩文件系统来说开启收益有，但不大<br>
-如果是非压缩文件系统，性价比还是比较高的<br>
-所以压缩是用运存空间来换rom空间，觉得值得就可以开启
-#### 关于ssr配合
-  - 方法一gfw代理：dns重定向-作为dnsmasq的上游服务器 
-  - 方法二gfw代理：手动设置adh上游dns为自己即127.0.0.1:[自己监听的端口]，然后使用 dns重定向-使用53端口替换dnsmasq，（因为端口互换后就是dnsmasq为上游了）
-  - 方法三国外ip代理：任意重定向方式，adh加入gfw列表，开启计划任务定时更新gfw即可
-  - 方法四gfw代理：dns重定向-重定向53端口到AdGuardHome,设置adh上游dns 为127.0.0.1:53
-#### 项目已经基本稳定，有bug欢迎主动反馈
+## 修改内容

-Complex openwrt AdGuardHome luci
+   - 修复 本地 AdGuardHome 核心文件版本号获取

- - can manage browser port
- - download/update core in luci
- - compress core with upx
- - redirect dns
-   - as the upstream of dnsmasq
-   - redirect port 53 to AdGuardHome（ipv6 need to install ipv6 nat redirect or  if client use ipv6 redirect is invalid）
-   - replace dnsmasq with port 53 (need to set AGH,dnsip=0.0.0.0,the port of dnsmasq and AGH will be exchange)
- - change bin path
- - change config path
- - change work dir(support tmp,auto redownload after reboot)
- - change runtime log path
- - gfwlist query to specific dns server
- - modify browser login passord
- - Positive/reverse order see/del/backup runtime log which update every 3 second
- - modify config manually(support yaml editor)
- - use template to fast config(when no config file)
- - Keep bin file and config when system upgrade (database and querylog can be choose) 
- - when boot wait for network access （3min timeout）
- - backup workdir when shutdown
-#### known issues:
- - db database not support filesystem which not support mmap such as jffs2 and data-stk-oo,please modify work dir,if jffs2 is found,will auto ln (soft link)the dbs to /tmp ,will lost dns database after reboot
- - AdGuardhome not support ipset,when we use ipset ,it can\`t be the repacement of dnsmasq but the upstream of dnsmasq ,if you want it,vote for it.<br>
- https://github.com/AdguardTeam/AdGuardHome/issues/1191<br>
- - find so many localhost query from 127.0.0.1,the ddns plugin is the reason,if you don\`t use ddns, please remove or comment \etc\hotplug.d\iface\95-ddns
-#### usage
- - download release，install it with opkg
- - or when make op,clone the code to the package path and set it as y or m
+   - 优化 AdGuardHome 核心更新以及UPX压缩流程

-#### pic
-example in zh-cn:<br>
-![Screenshot_2019-12-23 newifi-d1 - 基础设置 - LuCI](https://user-images.githubusercontent.com/22387141/71361626-81d60900-25ce-11ea-91d5-ac4e35d5c41e.png)
-![图片](https://user-images.githubusercontent.com/22387141/71361650-90242500-25ce-11ea-9727-9306a3da1357.png)
-![Screenshot_2019-12-23 newifi-d1 - 日志 - LuCI(1)](https://user-images.githubusercontent.com/22387141/71361700-b944b580-25ce-11ea-8562-f68c28952b2b.png)
-![Screenshot_2019-12-23 newifi-d1 - 手动设置 - LuCI](https://user-images.githubusercontent.com/22387141/71361704-bb0e7900-25ce-11ea-8042-6dd396607030.png)
+   - 汉化 AdGuardHome 核心更新时显示的内容
+
+   - 优化 默认模板、DNS 服务器以及 DNS 封锁清单
+
+## Based on
+
+   - [rufengsuixing](https://github.com/rufengsuixing/luci-app-adguardhome)
+   
+   - [Lienol](https://github.com/Lienol)
--- a/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua
+++ b/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua
@ -3,10 +3,7 @@ local fs = require "nixio.fs"
 local http = require "luci.http"
 local uci = require"luci.model.uci".cursor()
 function index()
-local page = entry({"admin", "services", "AdGuardHome"},alias("admin", "services", "AdGuardHome", "base"),_("AdGuard Home"))
-page.order = 11
-page.dependent = true
-page.acl_depends = { "luci-app-adguardhome" }
+    entry({"admin", "services", "AdGuardHome"}, alias("admin", "services", "AdGuardHome", "base"), _("AdGuard Home"), 10).dependent = true
    entry({"admin", "services", "AdGuardHome", "base"}, cbi("AdGuardHome/base"),  _("Base Setting"), 1).leaf = true
    entry({"admin", "services", "AdGuardHome", "log"}, form("AdGuardHome/log"), _("Log"), 2).leaf = true
    entry({"admin", "services", "AdGuardHome", "manual"}, cbi("AdGuardHome/manual"), _("Manual Config"), 3).leaf = true
@ -18,113 +15,116 @@ page.acl_depends = { "luci-app-adguardhome" }
    entry({"admin", "services", "AdGuardHome", "reloadconfig"}, call("reload_config"))
    entry({"admin", "services", "AdGuardHome", "gettemplateconfig"}, call("get_template_config"))
 end
-function get_template_config()
-	local b
-	local d=""
-	for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do
-		b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$")
-		if (b~=nil) then
-			d=d.."  - "..b.."\n"
-		end
-	end
-	local f=io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
-	local tbl = {}
-	local a=""
-	while (1) do
-    	a=f:read("*l")
-		if (a=="#bootstrap_dns") then
-			a=d
-		elseif (a=="#upstream_dns") then
-			a=d
-		elseif (a==nil) then
-			break
-		end
-		table.insert(tbl, a)
-	end
-	f:close()
-	http.prepare_content("text/plain; charset=utf-8")
-	http.write(table.concat(tbl, "\n"))
-end
-function reload_config()
-	fs.remove("/tmp/AdGuardHometmpconfig.yaml")
-	http.prepare_content("application/json")
-	http.write('')
-end
-function act_status()
-	local e={}
-	local binpath=uci:get("AdGuardHome","AdGuardHome","binpath")
-	e.running=luci.sys.call("pgrep "..binpath.." >/dev/null")==0
-	e.redirect=(fs.readfile("/var/run/AdGredir")=="1")
-	http.prepare_content("application/json")
-	http.write_json(e)
-end
-function do_update()
-	fs.writefile("/var/run/lucilogpos","0")
-	http.prepare_content("application/json")
-	http.write('')
-	local arg
-	if luci.http.formvalue("force") == "1" then
-		arg="force"
-	else
-		arg=""
-	end
-	if arg=="force" then
-			luci.sys.exec("kill $(pgrep /usr/share/AdGuardHome/update_core.sh) ; sh /usr/share/AdGuardHome/update_core.sh "..arg.." >/tmp/AdGuardHome_update.log 2>&1 &")
-	

-	else
-		luci.sys.exec("sh /usr/share/AdGuardHome/update_core.sh "..arg.." >/tmp/AdGuardHome_update.log 2>&1 &")
+function get_template_config()
+    local b
+	local d = ""
+	local file = "/tmp/resolv.conf.d/resolv.conf.auto"
+	if not fs.access(file) then
+		file = "/tmp/resolv.conf.auto"
 	end
+    for cnt in io.lines(file) do
+        b = string.match(cnt, "^[^#]*nameserver%s+([^%s]+)$")
+        if (b ~= nil) then d = d .. "  - " .. b .. "\n" end
+    end
+    local f = io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
+    local tbl = {}
+    local a = ""
+    while (1) do
+        a = f:read("*l")
+        if (a == "#bootstrap_dns") then
+            a = d
+        elseif (a == "#upstream_dns") then
+            a = d
+        elseif (a == nil) then
+            break
+        end
+        table.insert(tbl, a)
+    end
+    f:close()
+    http.prepare_content("text/plain; charset=utf-8")
+    http.write(table.concat(tbl, "\n"))
 end
+
+function reload_config()
+    fs.remove("/tmp/AdGuardHometmpconfig.yaml")
+    http.prepare_content("application/json")
+    http.write('')
+end
+
+function act_status()
+    local e = {}
+    local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath")
+    e.running = luci.sys.call("pgrep " .. binpath .. " >/dev/null") == 0
+    e.redirect = (fs.readfile("/var/run/AdGredir") == "1")
+    http.prepare_content("application/json")
+    http.write_json(e)
+end
+
+function do_update()
+    fs.writefile("/var/run/lucilogpos", "0")
+    http.prepare_content("application/json")
+    http.write('')
+    local arg
+    if luci.http.formvalue("force") == "1" then
+        arg = "force"
+    else
+        arg = ""
+    end
+    if fs.access("/var/run/update_core") then
+        if arg == "force" then
+            luci.sys.exec("kill $(pgrep /usr/share/AdGuardHome/update_core.sh) ; sh /usr/share/AdGuardHome/update_core.sh " .. arg .. " >/tmp/AdGuardHome_update.log 2>&1 &")
+        end
+    else
+        luci.sys.exec("sh /usr/share/AdGuardHome/update_core.sh " .. arg .. " >/tmp/AdGuardHome_update.log 2>&1 &")
+    end
+end
+
 function get_log()
-	local logfile=uci:get("AdGuardHome","AdGuardHome","logfile")
-	if (logfile==nil) then
-		http.write("no log available\n")
-		return
-	elseif (logfile=="syslog") then
-		if not fs.access("/var/run/AdGuardHomesyslog") then
-			luci.sys.exec("(/usr/share/AdGuardHome/getsyslog.sh &); sleep 1;")
-		end
-		logfile="/tmp/AdGuardHometmp.log"
-		fs.writefile("/var/run/AdGuardHomesyslog","1")
-	elseif not fs.access(logfile) then
-		http.write("")
-		return
-	end
-	http.prepare_content("text/plain; charset=utf-8")
-	local fdp
-	if fs.access("/var/run/lucilogreload") then
-		fdp=0
-		fs.remove("/var/run/lucilogreload")
-	else
-		fdp=tonumber(fs.readfile("/var/run/lucilogpos")) or 0
-	end
-	local f=io.open(logfile, "r+")
-	f:seek("set",fdp)
-	local a=f:read(2048000) or ""
-	fdp=f:seek()
-	fs.writefile("/var/run/lucilogpos",tostring(fdp))
-	f:close()
-	http.write(a)
+    local logfile = uci:get("AdGuardHome", "AdGuardHome", "logfile")
+    if (logfile == nil) then
+        http.write("no log available\n")
+        return
+    elseif (logfile == "syslog") then
+        if not fs.access("/var/run/AdGuardHomesyslog") then
+            luci.sys.exec("(/usr/share/AdGuardHome/getsyslog.sh &); sleep 1;")
+        end
+        logfile = "/tmp/AdGuardHometmp.log"
+        fs.writefile("/var/run/AdGuardHomesyslog", "1")
+    elseif not fs.access(logfile) then
+        http.write("")
+        return
+    end
+    http.prepare_content("text/plain; charset=utf-8")
+    local fdp = tonumber(fs.readfile("/var/run/lucilogpos")) or 0
+    local f = io.open(logfile, "r+")
+    f:seek("set", fdp)
+    local a = f:read(2048000) or ""
+    fdp = f:seek()
+    fs.writefile("/var/run/lucilogpos", tostring(fdp))
+    f:close()
+    http.write(a)
 end
+
 function do_dellog()
-	local logfile=uci:get("AdGuardHome","AdGuardHome","logfile")
-	fs.writefile(logfile,"")
-	http.prepare_content("application/json")
-	http.write('')
+    local logfile = uci:get("AdGuardHome", "AdGuardHome", "logfile")
+    fs.writefile(logfile, "")
+    http.prepare_content("application/json")
+    http.write('')
 end
+
 function check_update()
-	http.prepare_content("text/plain; charset=utf-8")
-	local fdp=tonumber(fs.readfile("/var/run/lucilogpos")) or 0
-	local f=io.open("/tmp/AdGuardHome_update.log", "r+")
-	f:seek("set",fdp)
-	local a=f:read(2048000) or ""
-	fdp=f:seek()
-	fs.writefile("/var/run/lucilogpos",tostring(fdp))
-	f:close()
-if fs.access("/var/run/update_core") then
-	http.write(a)
-else
-	http.write(a.."\0")
-end
+    http.prepare_content("text/plain; charset=utf-8")
+    local fdp = tonumber(fs.readfile("/var/run/lucilogpos")) or 0
+    local f = io.open("/tmp/AdGuardHome_update.log", "r+")
+    f:seek("set", fdp)
+    local a = f:read(2048000) or ""
+    fdp = f:seek()
+    fs.writefile("/var/run/lucilogpos", tostring(fdp))
+    f:close()
+    if fs.access("/var/run/update_core") then
+        http.write(a)
+    else
+        http.write(a .. "\0")
+    end
 end
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
@ -1,89 +1,100 @@
 require("luci.sys")
 require("luci.util")
 require("io")
-local m,s,o,o1
-local fs=require"nixio.fs"
-local uci=require"luci.model.uci".cursor()
-local configpath=uci:get("AdGuardHome","AdGuardHome","configpath") or "/etc/AdGuardHome.yaml"
-local binpath=uci:get("AdGuardHome","AdGuardHome","binpath") or "/usr/bin/AdGuardHome"
-httpport=uci:get("AdGuardHome","AdGuardHome","httpport") or "3000"
+local m, s, o, o1
+local fs = require "nixio.fs"
+local uci = require"luci.model.uci".cursor()
+local configpath = uci:get("AdGuardHome", "AdGuardHome", "configpath") or "/etc/config/AdGuardHome.yaml"
+local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath") or "/usr/bin/AdGuardHome/AdGuardHome"
+httpport = uci:get("AdGuardHome", "AdGuardHome", "httpport") or "3000"
+
 m = Map("AdGuardHome", "AdGuard Home")
 m.description = translate("Free and open source, powerful network-wide ads & trackers blocking DNS server.")
-m:section(SimpleSection).template  = "AdGuardHome/AdGuardHome_status"
+m:section(SimpleSection).template = "AdGuardHome/AdGuardHome_status"

 s = m:section(TypedSection, "AdGuardHome")
-s.anonymous=true
-s.addremove=false
+s.anonymous = true
+s.addremove = false
+
 ---- enable
 o = s:option(Flag, "enabled", translate("Enable"))
 o.default = 0
 o.optional = false
+
 ---- httpport
-o =s:option(Value,"httpport",translate("Browser management port"))
-o.placeholder=3000
-o.default=3000
-o.datatype="port"
+o = s:option(Value, "httpport", translate("Browser management port"))
+o.placeholder = 3000
+o.default = 3000
+o.datatype = "port"
 o.optional = false
-o.description = translate("<input type=\"button\" style=\"width:210px;border-color:Teal; text-align:center;font-weight:bold;color:Green;\" value=\"AdGuardHome Web:"..httpport.."\" onclick=\"window.open('http://'+window.location.hostname+':"..httpport.."/')\"/>")
+o.description = translate("<input type='button' style='width:210px; border-color:Teal; text-align:center; font-weight:bold;color:Green;' value='AdGuardHome Web:" .. httpport .. "' onclick=\"window.open('http://'+window.location.hostname+':" .. httpport .. "')\"/>")
+
 ---- update warning not safe
-local binmtime=uci:get("AdGuardHome","AdGuardHome","binmtime") or "0"
-local e=""
-if not fs.access(configpath) then
-	e=e.." "..translate("no config")
-end
+local binmtime = uci:get("AdGuardHome", "AdGuardHome", "binmtime") or "0"
+local e = ""
+if not fs.access(configpath) then e = e .. " " .. translate("no config") end
 if not fs.access(binpath) then
-	e=e.." "..translate("no core")
+    e = e .. " " .. translate("no core")
 else
-	local version=uci:get("AdGuardHome","AdGuardHome","version")
-	local testtime=fs.stat(binpath,"mtime")
-	if testtime~=tonumber(binmtime) or version==nil then
-		local tmp=luci.sys.exec(binpath.." --version | grep -m 1 -E 'v[0-9.]+' -o ")
-		version=string.sub(tmp, 1)
-		if version=="" then version="core error" end
-		uci:set("AdGuardHome","AdGuardHome","version",version)
-		uci:set("AdGuardHome","AdGuardHome","binmtime",testtime)
-		uci:save("AdGuardHome")
-	end
-	e=version..e
+    local version = uci:get("AdGuardHome", "AdGuardHome", "version")
+    local testtime = fs.stat(binpath, "mtime")
+    if testtime ~= tonumber(binmtime) or version == nil then
+        -- local tmp=luci.sys.exec(binpath.." -c /dev/null --check-config 2>&1| grep -m 1 -E 'v[0-9.]+' -o")
+        -- version=string.sub(tmp, 1, -2)
+        version = luci.sys.exec(string.format("echo -n $(%s --version 2>&1 | awk -F 'version ' '{print $2}' | awk -F ',' '{print $1}')", binpath))
+        if version == "" then version = "core error" end
+        uci:set("AdGuardHome", "AdGuardHome", "version", version)
+        uci:set("AdGuardHome", "AdGuardHome", "binmtime", testtime)
+        uci:commit("AdGuardHome")
+    end
+    e = version .. e
 end
-o=s:option(Button,"restart",translate("Update"))
-o.inputtitle=translate("Update core version")
+
+o = s:option(ListValue, "core_version", translate("Core Version"))
+o:value("latest", translate("Latest Version"))
+o:value("beta", translate("Beta Version"))
+o.default = "latest"
+
+o = s:option(Button, "restart", translate("Upgrade Core"))
+o.inputtitle = translate("Update core version")
 o.template = "AdGuardHome/AdGuardHome_check"
-o.showfastconfig=(not fs.access(configpath))
-o.description=string.format(translate("core version:").."<strong><font id=\"updateversion\" color=\"green\">%s </font></strong>",e)
+o.showfastconfig = (not fs.access(configpath))
+o.description = string.format(translate("Current core version:") .. "<strong><font id='updateversion' color='green'>%s </font></strong>", e)
+
 ---- port warning not safe
-local port=luci.sys.exec("awk '/  port:/{printf($2);exit;}' "..configpath.." 2>nul")
-if (port=="") then port="?" end
+local port = luci.sys.exec("awk '/  port:/{printf($2);exit;}' " .. configpath .. " 2>nul")
+if (port == "") then port = "?" end
+
 ---- Redirect
-o = s:option(ListValue, "redirect", port..translate("Redirect"), translate("AdGuardHome redirect mode"))
+o = s:option(ListValue, "redirect", port .. translate("Redirect"), translate("AdGuardHome redirect mode"))
 o.placeholder = "none"
 o:value("none", translate("none"))
 o:value("dnsmasq-upstream", translate("Run as dnsmasq upstream server"))
 o:value("redirect", translate("Redirect 53 port to AdGuardHome"))
 o:value("exchange", translate("Use port 53 replace dnsmasq"))
-o.default     = "none"
+o.default = "none"
 o.optional = true
+
 ---- bin path
 o = s:option(Value, "binpath", translate("Bin Path"), translate("AdGuardHome Bin path if no bin will auto download"))
-o.default     = "/usr/bin/AdGuardHome"
-o.datatype    = "string"
+o.default = "/usr/bin/AdGuardHome/AdGuardHome"
+o.datatype = "string"
 o.optional = false
-o.rmempty=false
-o.validate=function(self, value)
-if value=="" then return nil end
-if fs.stat(value,"type")=="dir" then
-	fs.rmdir(value)
-end
-if fs.stat(value,"type")=="dir" then
-	if (m.message) then
-	m.message =m.message.."\nerror!bin path is a dir"
-	else
-	m.message ="error!bin path is a dir"
-	end
-	return nil
-end
-return value
+o.rmempty = false
+o.validate = function(self, value)
+    if value == "" then return nil end
+    if fs.stat(value, "type") == "dir" then fs.rmdir(value) end
+    if fs.stat(value, "type") == "dir" then
+        if (m.message) then
+            m.message = m.message .. "\nerror!bin path is a dir"
+        else
+            m.message = "error!bin path is a dir"
+        end
+        return nil
+    end
+    return value
 end
+
 --- upx
 o = s:option(ListValue, "upxflag", translate("use upx to compress bin after download"))
 o:value("", translate("none"))
@ -92,213 +103,214 @@ o:value("-9", translate("compress better"))
 o:value("--best", translate("compress best(can be slow for big files)"))
 o:value("--brute", translate("try all available compression methods & filters [slow]"))
 o:value("--ultra-brute", translate("try even more compression variants [very slow]"))
-o.default     = ""
-o.description=translate("bin use less space,but may have compatibility issues")
+o.default = ""
+o.description = translate("bin use less space,but may have compatibility issues")
 o.rmempty = true
+
 ---- config path
 o = s:option(Value, "configpath", translate("Config Path"), translate("AdGuardHome config path"))
-o.default     = "/etc/AdGuardHome.yaml"
-o.datatype    = "string"
+o.default = "/etc/config/AdGuardHome.yaml"
+o.datatype = "string"
 o.optional = false
-o.rmempty=false
-o.validate=function(self, value)
-if value==nil then return nil end
-if fs.stat(value,"type")=="dir" then
-	fs.rmdir(value)
-end
-if fs.stat(value,"type")=="dir" then
-	if m.message then
-	m.message =m.message.."\nerror!config path is a dir"
-	else
-	m.message ="error!config path is a dir"
-	end
-	return nil
-end
-return value
+o.rmempty = false
+o.validate = function(self, value)
+    if value == nil then return nil end
+    if fs.stat(value, "type") == "dir" then fs.rmdir(value) end
+    if fs.stat(value, "type") == "dir" then
+        if m.message then
+            m.message = m.message .. "\nerror!config path is a dir"
+        else
+            m.message = "error!config path is a dir"
+        end
+        return nil
+    end
+    return value
 end
+
 ---- work dir
 o = s:option(Value, "workdir", translate("Work dir"), translate("AdGuardHome work dir include rules,audit log and database"))
-o.default     = "/etc/AdGuardHome"
-o.datatype    = "string"
+o.default = "/usr/bin/AdGuardHome"
+o.datatype = "string"
 o.optional = false
-o.rmempty=false
-o.validate=function(self, value)
-if value=="" then return nil end
-if fs.stat(value,"type")=="reg" then
-	if m.message then
-	m.message =m.message.."\nerror!work dir is a file"
-	else
-	m.message ="error!work dir is a file"
-	end
-	return nil
-end
-if string.sub(value, -1)=="/" then
-	return string.sub(value, 1, -2)
-else
-	return value
-end
+o.rmempty = false
+o.validate = function(self, value)
+    if value == "" then return nil end
+    if fs.stat(value, "type") == "reg" then
+        if m.message then
+            m.message = m.message .. "\nerror!work dir is a file"
+        else
+            m.message = "error!work dir is a file"
+        end
+        return nil
+    end
+    if string.sub(value, -1) == "/" then
+        return string.sub(value, 1, -2)
+    else
+        return value
+    end
 end
+
 ---- log file
 o = s:option(Value, "logfile", translate("Runtime log file"), translate("AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"))
-o.datatype    = "string"
+o.datatype = "string"
 o.rmempty = true
-o.validate=function(self, value)
-if fs.stat(value,"type")=="dir" then
-	fs.rmdir(value)
-end
-if fs.stat(value,"type")=="dir" then
-	if m.message then
-	m.message =m.message.."\nerror!log file is a dir"
-	else
-	m.message ="error!log file is a dir"
-	end
-	return nil
-end
-return value
+o.validate = function(self, value)
+    if fs.stat(value, "type") == "dir" then fs.rmdir(value) end
+    if fs.stat(value, "type") == "dir" then
+        if m.message then
+            m.message = m.message .. "\nerror!log file is a dir"
+        else
+            m.message = "error!log file is a dir"
+        end
+        return nil
+    end
+    return value
 end
+
 ---- debug
 o = s:option(Flag, "verbose", translate("Verbose log"))
 o.default = 0
 o.optional = true
---- gfwlist
-local a=luci.sys.call("grep -m 1 -q programadd "..configpath)
-if (a==0) then
-a="Added"
+
+---- gfwlist 
+local a = luci.sys.call("grep -m 1 -q programadd " .. configpath)
+if (a == 0) then
+    a = "Added"
 else
-a="Not added"
+    a = "Not added"
 end
-o=s:option(Button,"gfwdel",translate("Del gfwlist"),translate(a))
+
+o = s:option(Button, "gfwdel", translate("Del gfwlist"), translate(a))
 o.optional = true
-o.inputtitle=translate("Del")
-o.write=function()
-	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh del 2>&1")
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
+o.inputtitle = translate("Del")
+o.write = function()
+    luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh del 2>&1")
+    luci.http.redirect(luci.dispatcher.build_url("admin", "services", "AdGuardHome"))
 end
-o=s:option(Button,"gfwadd",translate("Add gfwlist"),translate(a))
+
+o = s:option(Button, "gfwadd", translate("Add gfwlist"), translate(a))
 o.optional = true
-o.inputtitle=translate("Add")
-o.write=function()
-	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh 2>&1")
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
+o.inputtitle = translate("Add")
+o.write = function()
+    luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh 2>&1")
+    luci.http.redirect(luci.dispatcher.build_url("admin", "services", "AdGuardHome"))
 end
-o = s:option(Value, "gfwupstream", translate("Gfwlist upstream dns server"), translate("Gfwlist domain upstream dns service")..translate(a))
-o.default     = "tcp://208.67.220.220:5353"
-o.datatype    = "string"
+
+o = s:option(Value, "gfwupstream", translate("Gfwlist upstream dns server"), translate("Gfwlist domain upstream dns service") .. translate(a))
+o.default = "tcp://208.67.220.220:5353"
+o.datatype = "string"
 o.optional = true
+
 ---- chpass
 o = s:option(Value, "hashpass", translate("Change browser management password"), translate("Press load culculate model and culculate finally save/apply"))
-o.default     = ""
-o.datatype    = "string"
+o.default = ""
+o.datatype = "string"
 o.template = "AdGuardHome/AdGuardHome_chpass"
 o.optional = true
+
 ---- upgrade protect
 o = s:option(MultiValue, "upprotect", translate("Keep files when system upgrade"))
-o:value("$binpath",translate("core bin"))
-o:value("$configpath",translate("config file"))
-o:value("$logfile",translate("log file"))
-o:value("$workdir/data/sessions.db",translate("sessions.db"))
-o:value("$workdir/data/stats.db",translate("stats.db"))
-o:value("$workdir/data/querylog.json",translate("querylog.json"))
-o:value("$workdir/data/filters",translate("filters"))
+o:value("$binpath", translate("core bin"))
+o:value("$configpath", translate("config file"))
+o:value("$logfile", translate("log file"))
+o:value("$workdir/data/sessions.db", translate("sessions.db"))
+o:value("$workdir/data/stats.db", translate("stats.db"))
+o:value("$workdir/data/querylog.json", translate("querylog.json"))
+o:value("$workdir/data/filters", translate("filters"))
 o.widget = "checkbox"
 o.default = nil
-o.optional=true
+o.optional = true
+
 ---- wait net on boot
 o = s:option(Flag, "waitonboot", translate("On boot when network ok restart"))
 o.default = 1
 o.optional = true
+
 ---- backup workdir on shutdown
-local workdir=uci:get("AdGuardHome","AdGuardHome","workdir") or "/etc/AdGuardHome"
+local workdir = uci:get("AdGuardHome", "AdGuardHome", "workdir") or "/usr/bin/AdGuardHome"
 o = s:option(MultiValue, "backupfile", translate("Backup workdir files when shutdown"))
 o1 = s:option(Value, "backupwdpath", translate("Backup workdir path"))
 local name
-o:value("filters","filters")
-o:value("stats.db","stats.db")
-o:value("querylog.json","querylog.json")
-o:value("sessions.db","sessions.db")
-o1:depends ("backupfile", "filters")
-o1:depends ("backupfile", "stats.db")
-o1:depends ("backupfile", "querylog.json")
-o1:depends ("backupfile", "sessions.db")
-for name in fs.glob(workdir.."/data/*")
-do
-	name=fs.basename (name)
-	if name~="filters" and name~="stats.db" and name~="querylog.json" and name~="sessions.db" then
-		o:value(name,name)
-		o1:depends ("backupfile", name)
-	end
+o:value("filters", "filters")
+o:value("stats.db", "stats.db")
+o:value("querylog.json", "querylog.json")
+o:value("sessions.db", "sessions.db")
+o1:depends("backupfile", "filters")
+o1:depends("backupfile", "stats.db")
+o1:depends("backupfile", "querylog.json")
+o1:depends("backupfile", "sessions.db")
+for name in fs.glob(workdir .. "/data/*") do
+    name = fs.basename(name)
+    if name ~= "filters" and name ~= "stats.db" and name ~= "querylog.json" and
+        name ~= "sessions.db" then
+        o:value(name, name)
+        o1:depends("backupfile", name)
+    end
 end
 o.widget = "checkbox"
 o.default = nil
-o.optional=false
-o.description=translate("Will be restore when workdir/data is empty")
+o.optional = false
+o.description = translate("Will be restore when workdir/data is empty")
 ----backup workdir path
-
-o1.default     = "/etc/AdGuardHome"
-o1.datatype    = "string"
+o1.default = "/usr/bin/AdGuardHome"
+o1.datatype = "string"
 o1.optional = false
-o1.validate=function(self, value)
-if fs.stat(value,"type")=="reg" then
-	if m.message then
-	m.message =m.message.."\nerror!backup dir is a file"
-	else
-	m.message ="error!backup dir is a file"
-	end
-	return nil
-end
-if string.sub(value,-1)=="/" then
-	return string.sub(value, 1, -2)
-else
-	return value
-end
+o1.validate = function(self, value)
+    if fs.stat(value, "type") == "reg" then
+        if m.message then
+            m.message = m.message .. "\nerror!backup dir is a file"
+        else
+            m.message = "error!backup dir is a file"
+        end
+        return nil
+    end
+    if string.sub(value, -1) == "/" then
+        return string.sub(value, 1, -2)
+    else
+        return value
+    end
 end

 ----Crontab
-o = s:option(MultiValue, "crontab", translate("Crontab task"),translate("Please change time and args in crontab"))
-o:value("autoupdate",translate("Auto update core"))
-o:value("cutquerylog",translate("Auto tail querylog"))
-o:value("cutruntimelog",translate("Auto tail runtime log"))
-o:value("autohost",translate("Auto update ipv6 hosts and restart adh"))
-o:value("autogfw",translate("Auto update gfwlist and restart adh"))
+o = s:option(MultiValue, "crontab", translate("Crontab task"), translate("Please change time and args in crontab"))
+o:value("autoupdate", translate("Auto update core"))
+o:value("cutquerylog", translate("Auto tail querylog"))
+o:value("cutruntimelog", translate("Auto tail runtime log"))
+o:value("autohost", translate("Auto update ipv6 hosts and restart adh"))
+o:value("autogfw", translate("Auto update gfwlist and restart adh"))
 o.widget = "checkbox"
 o.default = nil
-o.optional=true
+o.optional = true

----downloadpath
-o = s:option(TextValue, "downloadlinks",translate("Download links for update"))
+o = s:option(Value, "update_url", translate("Core Update URL"))
+o.default = "https://github.com/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz"
+o.placeholder = "https://github.com/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz"
+o.rmempty = false
 o.optional = false
-o.rows = 4
-o.wrap = "soft"
-o.cfgvalue = function(self, section)
-	return fs.readfile("/usr/share/AdGuardHome/links.txt")
-end
-o.write = function(self, section, value)
-	fs.writefile("/usr/share/AdGuardHome/links.txt", value:gsub("\r\n", "\n"))
-end
-fs.writefile("/var/run/lucilogpos","0")
+
 function m.on_commit(map)
-	if (fs.access("/var/run/AdGserverdis")) then
-		io.popen("/etc/init.d/AdGuardHome reload &")
-		return
-	end
-	local ucitracktest=uci:get("AdGuardHome","AdGuardHome","ucitracktest")
-	if ucitracktest=="1" then
-		return
-	elseif ucitracktest=="0" then
-		io.popen("/etc/init.d/AdGuardHome reload &")
-	else
-		if (fs.access("/var/run/AdGlucitest")) then
-			uci:set("AdGuardHome","AdGuardHome","ucitracktest","0")
-			io.popen("/etc/init.d/AdGuardHome reload &")
-		else
-			fs.writefile("/var/run/AdGlucitest","")
-			if (ucitracktest=="2") then
-				uci:set("AdGuardHome","AdGuardHome","ucitracktest","1")
-			else
-				uci:set("AdGuardHome","AdGuardHome","ucitracktest","2")
-			end
-		end
-		uci:save("AdGuardHome")
-	end
+    if (fs.access("/var/run/AdGserverdis")) then
+        io.popen("/etc/init.d/AdGuardHome reload &")
+        return
+    end
+    local ucitracktest = uci:get("AdGuardHome", "AdGuardHome", "ucitracktest")
+    if ucitracktest == "1" then
+        return
+    elseif ucitracktest == "0" then
+        io.popen("/etc/init.d/AdGuardHome reload &")
+    else
+        if (fs.access("/var/run/AdGlucitest")) then
+            uci:set("AdGuardHome", "AdGuardHome", "ucitracktest", "0")
+            io.popen("/etc/init.d/AdGuardHome reload &")
+        else
+            fs.writefile("/var/run/AdGlucitest", "")
+            if (ucitracktest == "2") then
+                uci:set("AdGuardHome", "AdGuardHome", "ucitracktest", "1")
+            else
+                uci:set("AdGuardHome", "AdGuardHome", "ucitracktest", "2")
+            end
+        end
+        uci:commit("AdGuardHome")
+    end
 end
 return m
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua
@ -4,13 +4,13 @@ local f, t
 f = SimpleForm("logview")
 f.reset = false
 f.submit = false
-t=f:field(TextValue,"conf")
-t.rmempty=true
-t.rows=20
-t.template="AdGuardHome/log"
-t.readonly="readonly"
-local logfile=uci:get("AdGuardHome","AdGuardHome","logfile") or ""
-t.timereplace=(logfile~="syslog" and logfile~="" )
-t.pollcheck=logfile~=""
-fs.writefile("/var/run/lucilogreload","")
+t = f:field(TextValue, "conf")
+t.rmempty = true
+t.rows = 20
+t.template = "AdGuardHome/log"
+t.readonly = "readonly"
+local logfile = uci:get("AdGuardHome", "AdGuardHome", "logfile") or ""
+t.timereplace = (logfile ~= "syslog" and logfile ~= "")
+t.pollcheck = logfile ~= ""
+fs.writefile("/var/run/lucilogpos", "0")
 return f
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua
@ -1,97 +1,100 @@
 local m, s, o
 local fs = require "nixio.fs"
-local uci=require"luci.model.uci".cursor()
-local sys=require"luci.sys"
+local uci = require"luci.model.uci".cursor()
+local sys = require "luci.sys"
 require("string")
 require("io")
 require("table")
 function gen_template_config()
-	local b
-	local d=""
-	for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do
-		b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$")
-		if (b~=nil) then
-			d=d.."  - "..b.."\n"
-		end
+    local b
+    local d = ""
+	local file = "/tmp/resolv.conf.d/resolv.conf.auto"
+	if not fs.access(file) then
+		file = "/tmp/resolv.conf.auto"
 	end
-	local f=io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
-	local tbl = {}
-	local a=""
-	while (1) do
-    	a=f:read("*l")
-		if (a=="#bootstrap_dns") then
-			a=d
-		elseif (a=="#upstream_dns") then
-			a=d
-		elseif (a==nil) then
-			break
-		end
-		table.insert(tbl, a)
-	end
-	f:close()
-	return table.concat(tbl, "\n")
+    for cnt in io.lines(file) do
+        b = string.match(cnt, "^[^#]*nameserver%s+([^%s]+)$")
+        if (b ~= nil) then d = d .. "  - " .. b .. "\n" end
+    end
+    local f = io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
+    local tbl = {}
+    local a = ""
+    while (1) do
+        a = f:read("*l")
+        if (a == "#bootstrap_dns") then
+            a = d
+        elseif (a == "#upstream_dns") then
+            a = d
+        elseif (a == nil) then
+            break
+        end
+        table.insert(tbl, a)
+    end
+    f:close()
+    return table.concat(tbl, "\n")
 end
+
 m = Map("AdGuardHome")
-local configpath = uci:get("AdGuardHome","AdGuardHome","configpath")
-local binpath = uci:get("AdGuardHome","AdGuardHome","binpath")
+local configpath = uci:get("AdGuardHome", "AdGuardHome", "configpath")
+local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath")
 s = m:section(TypedSection, "AdGuardHome")
-s.anonymous=true
-s.addremove=false
+s.anonymous = true
+s.addremove = false
+
 --- config
 o = s:option(TextValue, "escconf")
 o.rows = 66
 o.wrap = "off"
 o.rmempty = true
 o.cfgvalue = function(self, section)
-	return  fs.readfile("/tmp/AdGuardHometmpconfig.yaml") or fs.readfile(configpath) or gen_template_config() or ""
+    return fs.readfile("/tmp/AdGuardHometmpconfig.yaml") or fs.readfile(configpath) or gen_template_config() or ""
 end
-o.validate=function(self, value)
+o.validate = function(self, value)
    fs.writefile("/tmp/AdGuardHometmpconfig.yaml", value:gsub("\r\n", "\n"))
-	if fs.access(binpath) then
-		if (sys.call(binpath.." -c /tmp/AdGuardHometmpconfig.yaml --check-config 2> /tmp/AdGuardHometest.log")==0) then
-			return value
-		end
-	else
-		return value
-	end
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome","manual"))
-	return nil
+    if fs.access(binpath) then
+        if (sys.call(binpath .. " -c /tmp/AdGuardHometmpconfig.yaml --check-config 2> /tmp/AdGuardHometest.log") == 0) then return value end
+    else
+        return value
+    end
+    luci.http.redirect(luci.dispatcher.build_url("admin", "services", "AdGuardHome", "manual"))
+    return nil
 end
 o.write = function(self, section, value)
-	fs.move("/tmp/AdGuardHometmpconfig.yaml",configpath)
-end
-o.remove = function(self, section, value)
-	fs.writefile(configpath, "")
+    fs.move("/tmp/AdGuardHometmpconfig.yaml", configpath)
 end
+o.remove = function(self, section, value) fs.writefile(configpath, "") end
+
 --- js and reload button
 o = s:option(DummyValue, "")
-o.anonymous=true
+o.anonymous = true
 o.template = "AdGuardHome/yamleditor"
 if not fs.access(binpath) then
-	o.description=translate("WARNING!!! no bin found apply config will not be test")
+    o.description = translate("WARNING!!! no bin found apply config will not be test")
 end
+
 --- log 
 if (fs.access("/tmp/AdGuardHometmpconfig.yaml")) then
-local c=fs.readfile("/tmp/AdGuardHometest.log")
-if (c~="") then
-o = s:option(TextValue, "")
-o.readonly=true
-o.rows = 5
-o.rmempty = true
-o.name=""
-o.cfgvalue = function(self, section)
-	return fs.readfile("/tmp/AdGuardHometest.log")
-end
-end
+    local c = fs.readfile("/tmp/AdGuardHometest.log")
+    if (c ~= "") then
+        o = s:option(TextValue, "")
+        o.readonly = true
+        o.rows = 5
+        o.rmempty = true
+        o.name = ""
+        o.cfgvalue = function(self, section)
+            return fs.readfile("/tmp/AdGuardHometest.log")
+        end
+    end
 end
+
 function m.on_commit(map)
-	local ucitracktest=uci:get("AdGuardHome","AdGuardHome","ucitracktest")
-	if ucitracktest=="1" then
-		return
-	elseif ucitracktest=="0" then
-		io.popen("/etc/init.d/AdGuardHome reload &")
-	else
-		fs.writefile("/var/run/AdGlucitest","")
-	end
+    local ucitracktest = uci:get("AdGuardHome", "AdGuardHome", "ucitracktest")
+    if ucitracktest == "1" then
+        return
+    elseif ucitracktest == "0" then
+        io.popen("/etc/init.d/AdGuardHome reload &")
+    else
+        fs.writefile("/var/run/AdGlucitest", "")
+    end
 end
-return m
+return m
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm
@ -1,9 +1,9 @@
 <%+cbi/valueheader%>
 <%local fs=require"nixio.fs"%>
-<input type="button" class="btn cbi-button cbi-button-apply" id="apply_update_button" value="<%:Update core version%>" onclick=" return apply_update() "/>
-<input type="button" class="btn cbi-button cbi-button-apply" id="apply_forceupdate_button" value="<%:Force update%>" onclick=" return apply_forceupdate()" style="display:none"/>
+<input type="button" class="cbi-button cbi-button-apply" id="apply_update_button" value="<%:Update core version%>" onclick=" return apply_update() "/>
+<input type="button" class="cbi-button cbi-button-apply" id="apply_forceupdate_button" value="<%:Force update%>" onclick=" return apply_forceupdate()" style="display:none"/>
 <% if self.showfastconfig then %>
-<input type="button" class="btn cbi-button cbi-button-apply" id="to_configpage" value="<%:Fast config%>" onclick="location.href='<%=url([[admin]], [[services]], [[AdGuardHome]], [[manual]])%>'"/>
+<input type="button" class="cbi-button cbi-button-apply" id="to_configpage" value="<%:Fast config%>" onclick="location.href='<%=url([[admin]], [[services]], [[AdGuardHome]], [[manual]])%>'"/>
 <%end%>
 <div id="logview" style="display:none">
 <input type="checkbox" id="reversetag" value="reverse" onclick=" return reverselog()" style="vertical-align:middle;height: auto;"><%:reverse%></input>
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm
@ -45,5 +45,5 @@ function chpass(btn)
 		ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist })
 	%> />
 	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
-	<input type="button" class="btn cbi-button cbi-button-apply" id="cbid.AdGuardHome.AdGuardHome.applychpass" value="<%:Load culculate model%>" onclick="return chpass(this)"/>
+	<input type="button" class="cbi-button cbi-button-apply" id="cbid.AdGuardHome.AdGuardHome.applychpass" value="<%:Load culculate model%>" onclick="return chpass(this)"/>
 <%+cbi/valuefooter%>
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm
@ -4,15 +4,15 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[status]])%>', nu
 		var tb = document.getElementById('AdGuardHome_status');
 		if (data && tb) {
 			if (data.running) {
-				tb.innerHTML = '<em><b style=color:green>AdGuardHome <%:RUNNING%></b></em>';
+				tb.innerHTML = '<em><b><font color=green>AdGuardHome <%:RUNNING%></font></b></em>';
 			} else {
-				tb.innerHTML = '<em><b style=color:red>AdGuardHome <%:NOT RUNNING%></b></em>';
+				tb.innerHTML = '<em><b><font color=red>AdGuardHome <%:NOT RUNNING%></font></b></em>';
 			}
 			if (data.redirect)
 			{
-				tb.innerHTML+='<em><b style=color:green><%:Redirected%></b></em>'
+				tb.innerHTML+='<em><b><font color=green><%:Redirected%></font></b></em>'
 			} else {
-				tb.innerHTML+='<em><b style=color:red><%:Not redirect%></b></em>'	
+				tb.innerHTML+='<em><b><font color=red><%:Not redirect%></font></b></em>'	
 			}
 		}
 	}
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm
@ -4,8 +4,8 @@
 <input type="checkbox" name="NAME" value="localtime" onclick=" return chlogtime()" style="vertical-align:middle;height: auto;" checked><%:localtime%></input><br>
 <%end%>
 <textarea id="cbid.logview.1.conf" class="cbi-input-textarea" style="width: 100%;display:inline" data-update="change" rows="32" cols="60" readonly="readonly" > </textarea>
-<input type="button" class="btn cbi-button cbi-button-apply" id="apply_update_button" value="<%:dellog%>" onclick=" return apply_del_log() "/>
-<input type="button" class="btn cbi-button cbi-button-apply" value="<%:download log%>" style=" display:inline;" onclick=" return download_log()" />
+<input type="button" class="cbi-button cbi-button-apply" id="apply_update_button" value="<%:dellog%>" onclick=" return apply_del_log() "/>
+<input type="button" class="cbi-button cbi-button-apply" value="<%:download log%>" style=" display:inline;" onclick=" return download_log()" />
 <script type="text/javascript">//<![CDATA[
 var islogreverse = true;
 var isutc2local = <%=tostring(self.timereplace)%>;
@ -83,13 +83,12 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[getlog]])%>', nu
 		if (x.responseText && lv) {
 			if (isutc2local)
 			{
-				var lines=line_toUTC(x.responseText);
+				var lines=line_tolocal(x.responseText);
 				if (islogreverse){
 					lv.innerHTML = lines.reverse().join('\n')+lv.innerHTML;
 				}else{
 					lv.innerHTML += lines.join('\n');
 				}
-			lv.innerHTML=line_tolocal(lv.innerHTML).join('\n');
 			}else{
 				if (islogreverse){
 					lv.innerHTML = x.responseText.split('\n').reverse().join('\n')+lv.innerHTML;
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
--- a/luci-app-adguardhome/po/zh-cn/AdGuardHome.po
+++ b/luci-app-adguardhome/po/zh-cn/AdGuardHome.po
@ -5,20 +5,11 @@ msgstr "基础设置"
 msgid "Log"
 msgstr "日志"

-msgid "AdGuardHome's version"
-msgstr "AdGuardHome 版本"
-
-msgid "Needed to click 'save&apply' to generate the configuration file"
-msgstr "需要点击“保存并应用”才能生成配置文件"
-
-msgid "In case of the latest realease is a source code that can not download the binary file"
-msgstr "防止最新release只有源码，导致下载不成功"
-
 msgid "Manual Config"
 msgstr "手动设置"

 msgid "Free and open source, powerful network-wide ads & trackers blocking DNS server."
-msgstr "全网络广告和跟踪程序拦截DNS服务器，默认账号和密码均为：admin"
+msgstr "免费开源, 功能强大的网络广告和跟踪程序拦截 DNS 服务器"

 msgid "RUNNING"
 msgstr "运行中"
@ -39,32 +30,37 @@ msgid "Enable"
 msgstr "启用"

 msgid "Browser management port"
-msgstr "网页管理账号和密码:admin ,端口:"
+msgstr "网页管理端口"

-msgid "Update"
-msgstr "更新"
+msgid "Upgrade Core"
+msgstr "更新核心"

-#button change
 msgid "Update core version"
 msgstr "更新核心版本"

 msgid "Check..."
-msgstr "检查中..."
+msgstr "检查中 ..."

 msgid "Updated"
 msgstr "已更新"

-#button hide
 msgid "Force update"
-msgstr "强制更新"
+msgstr "强制更新核心"

 msgid "Fast config"
 msgstr "快速配置"

-#
-msgid "core version:"
-msgstr "核心版本:"
-#description change
+msgid "Core Version"
+msgstr "核心版本"
+
+msgid "Latest Version"
+msgstr "最新版"
+
+msgid "Beta Version"
+msgstr "测试版"
+
+msgid "Current core version:"
+msgstr "当前核心版本:"

 msgid "no config"
 msgstr "没有配置文件"
@ -72,37 +68,33 @@ msgstr "没有配置文件"
 msgid "no core"
 msgstr "没有核心"

-#
 msgid "Redirect"
 msgstr "重定向"

-#inlist
 msgid "none"
 msgstr "无"

 msgid "Run as dnsmasq upstream server"
-msgstr "作为dnsmasq的上游服务器"
+msgstr "作为 dnsmasq 的上游服务器"

 msgid "Redirect 53 port to AdGuardHome"
-msgstr "重定向53端口到AdGuardHome"
+msgstr "重定向 53 端口到 AdGuardHome"

 msgid "Use port 53 replace dnsmasq"
-msgstr "使用53端口替换dnsmasq"
+msgstr "使用 53 端口替换 dnsmasq"

-#
 msgid "AdGuardHome redirect mode"
-msgstr "AdGuardHome重定向模式"
+msgstr "AdGuardHome 重定向模式"

 msgid "Bin Path"
 msgstr "执行文件路径"

 msgid "AdGuardHome Bin path if no bin will auto download"
-msgstr "AdGuardHome 执行文件路径 如果没有执行文件将自动下载"
+msgstr "AdGuardHome 执行文件路径, 启动时如果没有检测到执行文件将自动下载"

 msgid "use upx to compress bin after download"
-msgstr "下载后使用upx压缩执行文件"
+msgstr "UPX 压缩核心"

-#inlist
 msgid "compress faster"
 msgstr "快速压缩"

@ -110,7 +102,7 @@ msgid "compress better"
 msgstr "更好的压缩"

 msgid "compress best(can be slow for big files)"
-msgstr "最好的压缩(大文件可能慢)"
+msgstr "最好的压缩[大文件可能很慢]"

 msgid "try all available compression methods & filters [slow]"
 msgstr "尝试所有可能的压缩方法和过滤器[慢]"
@ -119,8 +111,8 @@ msgid "try even more compression variants [very slow]"
 msgstr "尝试更多变体压缩手段[很慢]"

 msgid "bin use less space,but may have compatibility issues"
-msgstr "减小执行文件空间占用，但是可能压缩后有兼容性问题"
-#
+msgstr "减小执行文件空间占用, 压缩后存在兼容性问题"
+
 msgid "Config Path"
 msgstr "配置文件路径"

@ -131,20 +123,19 @@ msgid "Work dir"
 msgstr "工作目录"

 msgid "AdGuardHome work dir include rules,audit log and database"
-msgstr "AdGuardHome 工作目录包含规则，审计日志和数据库"
+msgstr "AdGuardHome 工作目录包含规则, 审计日志和数据库"

 msgid "Runtime log file"
-msgstr "运行日志"
+msgstr "运行日志路径"

 msgid "AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"
-msgstr "AdGuardHome 运行日志 如果填syslog将写入系统日志；如果空则不记录日志"
+msgstr "AdGuardHome 运行日志, 如果填 syslog 将写入系统日志; 如果该项为空则不记录运行日志"

 msgid "Verbose log"
-msgstr "详细日志"
+msgstr "输出详细日志"

-#hide div
 msgid "Add gfwlist"
-msgstr "加入gfw列表"
+msgstr "添加 GFW 列表"

 msgid "Add"
 msgstr "添加"
@ -155,48 +146,42 @@ msgstr "已添加"
 msgid "Not added"
 msgstr "未添加"

-#hide div
 msgid "Del gfwlist"
-msgstr "删除gfw列表"
+msgstr "删除 GFW 列表"

 msgid "Del"
 msgstr "删除"

-#hide div
 msgid "Gfwlist upstream dns server"
-msgstr "gfw列表上游服务器"
+msgstr "GFW 列表上游服务器"

 msgid "Gfwlist domain upstream dns service"
-msgstr "gfw列表域名上游服务器"
+msgstr "GFW 列表域名上游服务器"

-#hide div
 msgid "Change browser management password"
-msgstr "改变网页登录密码"
+msgstr "更改网页登录密码"

 msgid "Culculate"
 msgstr "计算"

-##button change
 msgid "Load culculate model"
 msgstr "载入计算模块"

 msgid "loading..."
-msgstr "载入中"
+msgstr "载入中 ..."

 msgid "Please save/apply"
-msgstr "请提交"
+msgstr "请点击[保存/应用]"

 msgid "is empty"
 msgstr "为空"

 msgid "Press load culculate model and culculate finally save/apply"
-msgstr "按载入计算模块 然后计算 最后保存/提交"
+msgstr "先输入你想要的密码, 点击[载入计算模块], 然后点击[计算], 最后点击下方[保存&应用]"

-#
 msgid "Keep files when system upgrade"
 msgstr "系统升级时保留文件"

-#checkbox
 msgid "core bin"
 msgstr "核心执行文件"

@ -208,16 +193,15 @@ msgstr "日志文件"

 msgid "querylog.json"
 msgstr "审计日志.json"
-
 #
 msgid "On boot when network ok restart"
-msgstr "开机后网络准备好时重启"
+msgstr "开机后网络就绪时重启"

 msgid "Backup workdir files when shutdown"
-msgstr "在关机时备份工作目录文件"
+msgstr "在关机时备份以下文件"

 msgid "Will be restore when workdir/data is empty"
-msgstr "在工作目录/data为空的时候恢复"
+msgstr "备份将在 工作目录/data 为空的时候恢复"

 msgid "Backup workdir path"
 msgstr "工作目录备份路径"
@ -235,16 +219,16 @@ msgid "Auto tail runtime log"
 msgstr "自动截短运行日志"

 msgid "Auto update ipv6 hosts and restart adh"
-msgstr "自动更新ipv6主机并重启adh"
+msgstr "自动更新 IPv6 主机并重启 AdGuardHome"

 msgid "Auto update gfwlist and restart adh"
-msgstr "自动更新gfw列表并重启adh"
+msgstr "自动更新 GFW 列表并重启 AdGuardHome"

 msgid "Please change time and args in crontab"
 msgstr "请在计划任务中修改时间和参数"

-msgid "Download links for update"
-msgstr "升级用的下载链接"
+msgid "Core Update URL"
+msgstr "核心更新地址"

 #/cgi-bin/luci/admin/services/AdGuardHome/log/
 msgid "reverse"
@ -254,7 +238,7 @@ msgid "localtime"
 msgstr "本地时间"

 msgid "Please add log path in config to enable log"
-msgstr "请在设置里填写日志路径以启用日志"
+msgstr "请在设置里填写运行日志路径以启用日志"

 msgid "dellog"
 msgstr "删除日志"
@ -266,16 +250,14 @@ msgstr "下载日志"
 msgid "Use template"
 msgstr "使用模板"

-#hide button
 msgid "Reload Config"
 msgstr "重新载入配置"

 msgid "WARNING!!! no bin found apply config will not be test"
-msgstr "警告！！！未找到执行文件，提交配置将不会进行校验"
+msgstr "警告!!! 未找到执行文件, 提交配置将不会进行校验"

-#unused
 msgid "Change browser management username"
-msgstr "改变网页登录用户名"
+msgstr "更改网页登录用户名"

 msgid "Username"
 msgstr "用户名"
@ -290,4 +272,4 @@ msgid "Keep database when system upgrade"
 msgstr "系统升级时保留数据"

 msgid "Boot delay until network ok"
-msgstr "开机时直到网络准备好再启动"
+msgstr "开机时等到网络就绪后再启动"
--- a/luci-app-adguardhome/po/zh_Hans
+++ b/luci-app-adguardhome/po/zh_Hans
@ -1 +0,0 @@
-zh-cn
--- a/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po
+++ b/luci-app-adguardhome/po/zh_Hans/AdGuardHome.po
@ -0,0 +1,275 @@
+#/cgi-bin/luci/admin/services/AdGuardHome
+msgid "Base Setting"
+msgstr "基础设置"
+
+msgid "Log"
+msgstr "日志"
+
+msgid "Manual Config"
+msgstr "手动设置"
+
+msgid "Free and open source, powerful network-wide ads & trackers blocking DNS server."
+msgstr "免费开源, 功能强大的网络广告和跟踪程序拦截 DNS 服务器"
+
+msgid "RUNNING"
+msgstr "运行中"
+
+msgid "NOT RUNNING"
+msgstr "未运行"
+
+msgid "Redirected"
+msgstr "已重定向"
+
+msgid "Not redirect"
+msgstr "未重定向"
+
+msgid "Collecting data..."
+msgstr "获取数据中..."
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Browser management port"
+msgstr "网页管理端口"
+
+msgid "Upgrade Core"
+msgstr "更新核心"
+
+msgid "Update core version"
+msgstr "更新核心版本"
+
+msgid "Check..."
+msgstr "检查中 ..."
+
+msgid "Updated"
+msgstr "已更新"
+
+msgid "Force update"
+msgstr "强制更新核心"
+
+msgid "Fast config"
+msgstr "快速配置"
+
+msgid "Core Version"
+msgstr "核心版本"
+
+msgid "Latest Version"
+msgstr "最新版"
+
+msgid "Beta Version"
+msgstr "测试版"
+
+msgid "Current core version:"
+msgstr "当前核心版本:"
+
+msgid "no config"
+msgstr "没有配置文件"
+
+msgid "no core"
+msgstr "没有核心"
+
+msgid "Redirect"
+msgstr "重定向"
+
+msgid "none"
+msgstr "无"
+
+msgid "Run as dnsmasq upstream server"
+msgstr "作为 dnsmasq 的上游服务器"
+
+msgid "Redirect 53 port to AdGuardHome"
+msgstr "重定向 53 端口到 AdGuardHome"
+
+msgid "Use port 53 replace dnsmasq"
+msgstr "使用 53 端口替换 dnsmasq"
+
+msgid "AdGuardHome redirect mode"
+msgstr "AdGuardHome 重定向模式"
+
+msgid "Bin Path"
+msgstr "执行文件路径"
+
+msgid "AdGuardHome Bin path if no bin will auto download"
+msgstr "AdGuardHome 执行文件路径, 启动时如果没有检测到执行文件将自动下载"
+
+msgid "use upx to compress bin after download"
+msgstr "UPX 压缩核心"
+
+msgid "compress faster"
+msgstr "快速压缩"
+
+msgid "compress better"
+msgstr "更好的压缩"
+
+msgid "compress best(can be slow for big files)"
+msgstr "最好的压缩[大文件可能很慢]"
+
+msgid "try all available compression methods & filters [slow]"
+msgstr "尝试所有可能的压缩方法和过滤器[慢]"
+
+msgid "try even more compression variants [very slow]"
+msgstr "尝试更多变体压缩手段[很慢]"
+
+msgid "bin use less space,but may have compatibility issues"
+msgstr "减小执行文件空间占用, 压缩后存在兼容性问题"
+
+msgid "Config Path"
+msgstr "配置文件路径"
+
+msgid "AdGuardHome config path"
+msgstr "AdGuardHome 配置文件路径"
+
+msgid "Work dir"
+msgstr "工作目录"
+
+msgid "AdGuardHome work dir include rules,audit log and database"
+msgstr "AdGuardHome 工作目录包含规则, 审计日志和数据库"
+
+msgid "Runtime log file"
+msgstr "运行日志路径"
+
+msgid "AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"
+msgstr "AdGuardHome 运行日志, 如果填 syslog 将写入系统日志; 如果该项为空则不记录运行日志"
+
+msgid "Verbose log"
+msgstr "输出详细日志"
+
+msgid "Add gfwlist"
+msgstr "添加 GFW 列表"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "Added"
+msgstr "已添加"
+
+msgid "Not added"
+msgstr "未添加"
+
+msgid "Del gfwlist"
+msgstr "删除 GFW 列表"
+
+msgid "Del"
+msgstr "删除"
+
+msgid "Gfwlist upstream dns server"
+msgstr "GFW 列表上游服务器"
+
+msgid "Gfwlist domain upstream dns service"
+msgstr "GFW 列表域名上游服务器"
+
+msgid "Change browser management password"
+msgstr "更改网页登录密码"
+
+msgid "Culculate"
+msgstr "计算"
+
+msgid "Load culculate model"
+msgstr "载入计算模块"
+
+msgid "loading..."
+msgstr "载入中 ..."
+
+msgid "Please save/apply"
+msgstr "请点击[保存/应用]"
+
+msgid "is empty"
+msgstr "为空"
+
+msgid "Press load culculate model and culculate finally save/apply"
+msgstr "先输入你想要的密码, 点击[载入计算模块], 然后点击[计算], 最后点击下方[保存&应用]"
+
+msgid "Keep files when system upgrade"
+msgstr "系统升级时保留文件"
+
+msgid "core bin"
+msgstr "核心执行文件"
+
+msgid "config file"
+msgstr "配置文件"
+
+msgid "log file"
+msgstr "日志文件"
+
+msgid "querylog.json"
+msgstr "审计日志.json"
+#
+msgid "On boot when network ok restart"
+msgstr "开机后网络就绪时重启"
+
+msgid "Backup workdir files when shutdown"
+msgstr "在关机时备份以下文件"
+
+msgid "Will be restore when workdir/data is empty"
+msgstr "备份将在 工作目录/data 为空的时候恢复"
+
+msgid "Backup workdir path"
+msgstr "工作目录备份路径"
+
+msgid "Crontab task"
+msgstr "计划任务"
+
+msgid "Auto update core"
+msgstr "自动升级核心"
+
+msgid "Auto tail querylog"
+msgstr "自动截短查询日志"
+
+msgid "Auto tail runtime log"
+msgstr "自动截短运行日志"
+
+msgid "Auto update ipv6 hosts and restart adh"
+msgstr "自动更新 IPv6 主机并重启 AdGuardHome"
+
+msgid "Auto update gfwlist and restart adh"
+msgstr "自动更新 GFW 列表并重启 AdGuardHome"
+
+msgid "Please change time and args in crontab"
+msgstr "请在计划任务中修改时间和参数"
+
+msgid "Core Update URL"
+msgstr "核心更新地址"
+
+#/cgi-bin/luci/admin/services/AdGuardHome/log/
+msgid "reverse"
+msgstr "逆序"
+
+msgid "localtime"
+msgstr "本地时间"
+
+msgid "Please add log path in config to enable log"
+msgstr "请在设置里填写运行日志路径以启用日志"
+
+msgid "dellog"
+msgstr "删除日志"
+
+msgid "download log"
+msgstr "下载日志"
+
+#/cgi-bin/luci//admin/services/AdGuardHome/manual/
+msgid "Use template"
+msgstr "使用模板"
+
+msgid "Reload Config"
+msgstr "重新载入配置"
+
+msgid "WARNING!!! no bin found apply config will not be test"
+msgstr "警告!!! 未找到执行文件, 提交配置将不会进行校验"
+
+msgid "Change browser management username"
+msgstr "更改网页登录用户名"
+
+msgid "Username"
+msgstr "用户名"
+
+msgid "Check Config"
+msgstr "检查配置"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "Keep database when system upgrade"
+msgstr "系统升级时保留数据"
+
+msgid "Boot delay until network ok"
+msgstr "开机时等到网络就绪后再启动"
--- a/luci-app-adguardhome/root/etc/AdGuardHome.yaml
+++ b/luci-app-adguardhome/root/etc/AdGuardHome.yaml
@ -1,262 +0,0 @@
-bind_host: 0.0.0.0
-bind_port: 3000
-beta_bind_port: 0
-users:
- name: admin
-  password: $2y$10$vHRcARdPCieYG3RXWomV5evDYN.Nj/edtwEkQgQJZcK6z7qTLaIc6
-auth_attempts: 5
-block_auth_min: 15
-http_proxy: ""
-language: zh-cn
-rlimit_nofile: 0
-debug_pprof: false
-web_session_ttl: 720
-dns:
-  bind_hosts:
-  - 0.0.0.0
-  port: 5553
-  statistics_interval: 1
-  querylog_enabled: true
-  querylog_file_enabled: true
-  querylog_interval: 1
-  querylog_size_memory: 1000
-  anonymize_client_ip: false
-  protection_enabled: true
-  blocking_mode: default
-  blocking_ipv4: ""
-  blocking_ipv6: ""
-  blocked_response_ttl: 10
-  parental_block_host: family-block.dns.adguard.com
-  safebrowsing_block_host: standard-block.dns.adguard.com
-  ratelimit: 0
-  ratelimit_whitelist: []
-  refuse_any: false
-  upstream_dns:
-  - 223.5.5.5
-  upstream_dns_file: ""
-  bootstrap_dns:
-  - 119.29.29.29
-  - 223.5.5.5
-  all_servers: false
-  fastest_addr: false
-  fastest_timeout: 1s
-  allowed_clients: []
-  disallowed_clients: []
-  blocked_hosts:
-  - version.bind
-  - id.server
-  - hostname.bind
-  trusted_proxies:
-  - 127.0.0.0/8
-  - ::1/128
-  cache_size: 4194304
-  cache_ttl_min: 0
-  cache_ttl_max: 0
-  cache_optimistic: true
-  bogus_nxdomain: []
-  aaaa_disabled: false
-  enable_dnssec: false
-  edns_client_subnet: false
-  max_goroutines: 300
-  ipset: []
-  filtering_enabled: true
-  filters_update_interval: 24
-  parental_enabled: false
-  safesearch_enabled: false
-  safebrowsing_enabled: false
-  safebrowsing_cache_size: 1048576
-  safesearch_cache_size: 1048576
-  parental_cache_size: 1048576
-  cache_time: 30
-  rewrites: []
-  blocked_services: []
-  upstream_timeout: 10s
-  local_domain_name: lan
-  resolve_clients: true
-  use_private_ptr_resolvers: true
-  local_ptr_upstreams: []
-tls:
-  enabled: false
-  server_name: ""
-  force_https: false
-  port_https: 443
-  port_dns_over_tls: 853
-  port_dns_over_quic: 784
-  port_dnscrypt: 0
-  dnscrypt_config_file: ""
-  allow_unencrypted_doh: false
-  strict_sni_check: false
-  certificate_chain: ""
-  private_key: ""
-  certificate_path: ""
-  private_key_path: ""
-filters:
- enabled: true
-  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
-  name: AdGuard DNS filter
-  id: 1228750870
- enabled: true
-  url: http://sub.adtchrome.com/adt-chinalist-easylist.txt
-  name: 广告终结者使用的拦截规则，基于ChinaList+EasyList修正维护
-  id: 139789181
- enabled: true
-  url: https://easylist-downloads.adblockplus.org/easylist.txt
-  name: EasyList-去除国际网页中大多数广告，包括不需要的框架、图像和对象
-  id: 139789112
- enabled: false
-  url: https://easylist-downloads.adblockplus.org/easylistchina.txt
-  name: EasyList China-EasyList针对国内的补充规则
-  id: 139789121
- enabled: true
-  url: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-easylist.txt
-  name: anti-AD命中率最高列表
-  id: 139789122
- enabled: true
-  url: https://gitee.com/halflife/list/raw/master/ad.txt
-  name: halflife合并乘风
-  id: 139789131
- enabled: false
-  url: https://banbendalao.coding.net/p/adgk/d/ADgk/git/raw/master/ADgk.txt
-  name: adgk手机去广告规则
-  id: 139789132
- enabled: false
-  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/rule.txt
-  name: 乘风 广告过滤规则
-  id: 139789133
- enabled: false
-  url: https://raw.githubusercontent.com/BlueSkyXN/AdGuardHomeRules/master/all.txt
-  name: 百万ADH广告拦截过滤规则
-  id: 139789141
- enabled: false
-  url: https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Hosts/GoodbyeAds-Ultra.txt
-  name: GoodbyeAds 大全去广告
-  id: 139789142
- enabled: false
-  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt
-  name: 乘风 视频广告过滤规则
-  id: 139789143
- enabled: false
-  url: https://raw.githubusercontent.com/Goooler/1024_hosts/master/hosts
-  name: 1024host
-  id: 139789151
- enabled: false
-  url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext
-  name: Peter Lowe’s Ad and tracking server list
-  id: 139789152
- enabled: false
-  url: https://easylist.to/easylist/fanboy-social.txt
-  name: Fanboy's Social Blocking List
-  id: 139789153
- enabled: false
-  url: https://easylist.to/easylist/fanboy-annoyance.txt
-  name: Fanboy's Annoyance List
-  id: 139789154
- enabled: false
-  url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt
-  name: EasyList Cookie List
-  id: 139789155
- enabled: false
-  url: https://fanboy.co.nz/fanboy-antifacebook.txt
-  name: Anti-Facebook List
-  id: 139789161
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/14.txt
-  name: AdGuard Annoyances filter
-  id: 139789162
- enabled: false
-  url: https://www.malwaredomainlist.com/hostslist/hosts.txt
-  name: MalwareDomainList.com Hosts List
-  id: 139789163
- enabled: false
-  url: https://www.fanboy.co.nz/enhancedstats.txt
-  name: Fanboy's Enhanced Tracking List
-  id: 139789164
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/3.txt
-  name: AdGuard Tracking Protection filter
-  id: 139789165
- enabled: false
-  url: https://easylist.to/easylist/easylist.txt
-  name: EasyList
-  id: 139789171
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/11.txt
-  name: AdGuard Mobile Ads filter
-  id: 139789172
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
-  name: AdGuard Base filter
-  id: 139789173
- enabled: false
-  url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
-  name: Adblock Warning Removal List
-  id: 139789174
- enabled: false
-  url: https://fanboy.co.nz/fanboy-problematic-sites.txt
-  name: Fanboy's problematic-sites
-  id: 139789175
- enabled: false
-  url: https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt
-  name: Adbyby Lazy Rule
-  id: 139789182
- enabled: false
-  url: https://raw.githubusercontent.com/VeleSila/yhosts/master/hosts.txt
-  name: hosts
-  id: 139789183
- enabled: false
-  url: https://gitlab.com/xuhaiyang1234/AAK-Cont/raw/master/FINAL_BUILD/aak-cont-list-notubo.txt
-  name: aak-cont-list-notubo
-  id: 139789184
- enabled: false
-  url: https://adaway.org/hosts.txt
-  name: Adaway HOST
-  id: 139789187
-whitelist_filters: []
-user_rules:
- '@@||taobao.com^$important'
- '@@||tmall.com^$important'
- '@@||jd.com^important'
- '@@||flyme.cn^$important'
- '@@||meizu.com^$important'
- '@@||wl.jd.com^$important'
- '@@||flydigi.com^'
- '@@||pv.sohu.com^$important'
- /googleads.$~script,domain=~googleads.github.io
- /pagead/lvz?
- '||google.com/pagead/'
- '||static.doubleclick.net^$domain=youtube.com'
- '||youtube.com/get_midroll_'
- '||5hz.org^'
- '@@||000714.xyz^'
- '@@||blueskyxn.com^'
- '||topnewsfeeds.net^'
- '||nbryb.com^'
- '||superbdolly.com^'
- '||salutationcheerlessdemote.com^'
- '||buildingdoodlesquare.com^'
- '||colonistnobilityheroic.com^'
-dhcp:
-  enabled: false
-  interface_name: ""
-  dhcpv4:
-    gateway_ip: ""
-    subnet_mask: ""
-    range_start: ""
-    range_end: ""
-    lease_duration: 86400
-    icmp_timeout_msec: 1000
-    options: []
-  dhcpv6:
-    range_start: ""
-    lease_duration: 86400
-    ra_slaac_only: false
-    ra_allow_slaac: false
-clients: []
-log_compress: false
-log_localtime: false
-log_max_backups: 0
-log_max_size: 100
-log_max_age: 3
-log_file: ""
-verbose: false
-schema_version: 10
--- a/luci-app-adguardhome/root/etc/config/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/config/AdGuardHome
@ -1,11 +1,11 @@
 config AdGuardHome 'AdGuardHome'
 	option enabled '0'
 	option httpport '3000'
-	option redirect 'none'
-	option configpath '/etc/AdGuardHome.yaml'
-	option workdir '/etc/AdGuardHome'
+	option redirect 'dnsmasq-upstream'
+	option configpath '/etc/config/AdGuardHome.yaml'
+	option workdir '/usr/bin/AdGuardHome'
 	option logfile '/tmp/AdGuardHome.log'
 	option verbose '0'
-	option binpath '/usr/bin/AdGuardHome'
-	option upxflag '-1'
+	option binpath '/tmp/AdGuardHome/AdGuardHome'
+	option upxflag ''

--- a/luci-app-adguardhome/root/etc/init.d/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/init.d/AdGuardHome
@ -13,9 +13,7 @@ EXTRA_HELP="        do_redirect 0 or 1\
 		test_crontab
 		force_reload
 		isrunning"
-
-set_forward_dnsmasq()
-{
+set_forward_dnsmasq() {
 	local PORT="$1"
 	addr="127.0.0.1#$PORT"
 	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
@ -29,7 +27,7 @@ set_forward_dnsmasq()
 		if [ "$server" = "$addr" ]; then
 			continue
 		fi
-		# uci add_list dhcp.@dnsmasq[0].server=$server
+		uci add_list dhcp.@dnsmasq[0].server=$server
 	done
 	uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
 	uci set dhcp.@dnsmasq[0].noresolv=1
@ -37,8 +35,7 @@ set_forward_dnsmasq()
 	/etc/init.d/dnsmasq restart
 }

-stop_forward_dnsmasq()
-{
+stop_forward_dnsmasq() {
 	local OLD_PORT="$1"
 	addr="127.0.0.1#$OLD_PORT"
 	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
@ -50,74 +47,69 @@ stop_forward_dnsmasq()
 	uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
 	addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
 	if [ -z "$addrlist" ] ; then
-		uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
+		resolvfile="/tmp/resolv.conf.d/resolv.conf.auto"
+		[ ! -f "$resolvfile" ] && resolvfile="/tmp/resolv.conf.auto"
+		uci set dhcp.@dnsmasq[0].resolvfile="$resolvfile" 2>/dev/null
 		uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
 	fi
 	uci commit dhcp
 	/etc/init.d/dnsmasq restart
 }

-set_iptable()
-{
+set_iptable() {
 	local ipv6_server=$1
 	local tcp_server=$2
 	uci -q batch <<-EOF >/dev/null 2>&1
-	delete firewall.AdGuardHome
+  delete firewall.AdGuardHome
 	set firewall.AdGuardHome=include
 	set firewall.AdGuardHome.type=script
 	set firewall.AdGuardHome.path=/usr/share/AdGuardHome/firewall.start
 	set firewall.AdGuardHome.reload=1
 	commit firewall
 EOF
+	
+	[ "$tcp_server" == "1" ] && iptables -t nat -I PREROUTING 1 -m comment --comment "AdGuardHome" -p tcp --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT
+	iptables -t nat -I PREROUTING 1 -m comment --comment "AdGuardHome" -p udp --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT

-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
-	for IP in $IPS
-	do
-		if [ "$tcp_server" == "1" ]; then
-			iptables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-		fi
-		iptables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-	done
+	[ "$ipv6_server" == 0 ] && return

-	if [ "$ipv6_server" == 0 ]; then
-		return
-	fi
-
-	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
-	for IP in $IPS
-	do
-		if [ "$tcp_server" == "1" ]; then
-			ip6tables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-		fi
-		ip6tables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-	done
+	[ "$tcp_server" == "1" ] && ip6tables -t nat -I PREROUTING 1 -m comment --comment "AdGuardHome" -p tcp --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT
+	ip6tables -t nat -I PREROUTING 1 -m comment --comment "AdGuardHome" -p udp --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT
 }

-clear_iptable()
-{
+clear_iptable() {
 	uci -q batch <<-EOF >/dev/null 2>&1
-	delete firewall.AdGuardHome
+  delete firewall.AdGuardHome
 	commit firewall
 EOF
-	local OLD_PORT="$1"
-	local ipv6_server=$2
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
-	for IP in $IPS
-	do
-		iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-		iptables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-	done

-	if [ "$ipv6_server" == 0 ]; then
-		return
+	nums=$(iptables -t nat -n -L PREROUTING 2>/dev/null | grep -c "AdGuardHome")
+	if [ -n "$nums" ]; then
+		until [ "$nums" = 0 ]
+		do
+			rules=$(iptables -t nat -n -L PREROUTING --line-num 2>/dev/null | grep "AdGuardHome" | awk '{print $1}')
+			for rule in $rules
+			do
+				iptables -t nat -D PREROUTING $rule 2> /dev/null
+				break
+			done
+			nums=$(expr $nums - 1)
+		done
+	fi
+	
+	nums=$(ip6tables -t nat -n -L PREROUTING 2>/dev/null | grep -c "AdGuardHome")
+	if [ -n "$nums" ]; then
+		until [ "$nums" = 0 ]
+		do
+			rules=$(ip6tables -t nat -n -L PREROUTING --line-num 2>/dev/null | grep "AdGuardHome" | awk '{print $1}')
+			for rule in $rules
+			do
+				ip6tables -t nat -D PREROUTING $rule 2> /dev/null
+				break
+			done
+			nums=$(expr $nums - 1)
+		done
 	fi
-	echo "warn ip6tables nat mod is needed"
-	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
-	for IP in $IPS
-	do
-		ip6tables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-		ip6tables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-	done
 }

 service_triggers() {
@ -125,7 +117,7 @@ service_triggers() {
 	[ "$(uci get AdGuardHome.AdGuardHome.redirect)" == "redirect" ] && procd_add_reload_trigger firewall
 }

-isrunning(){
+isrunning() {
 	config_load "${CONFIGURATION}"
 	_isrunning
 	local r=$?
@ -133,20 +125,19 @@ isrunning(){
 	return $r
 }

-_isrunning(){
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+_isrunning() {
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
 	[ ! -f "$binpath" ] && return 2
 	pgrep $binpath 2>&1 >/dev/null && return 0
 	return 1
 }

-force_reload(){
+force_reload() {
 	config_load "${CONFIGURATION}"
 	_isrunning && procd_send_signal "$CONFIGURATION" || start
 }

-get_tz()
-{
+get_tz() {
 	SET_TZ=""

 	if [ -e "/etc/localtime" ]; then
@ -169,12 +160,11 @@ get_tz()
 	SET_TZ=$tz
 }

-rm_port53()
-{
+rm_port53() {
 	local AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
 	dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
 	if [ -z "$dnsmasq_port" ]; then
-	dnsmasq_port="53"
+		dnsmasq_port="53"
 	fi
 	if [ "$dnsmasq_port" == "$AdGuardHome_PORT" ]; then
 		if [ "$dnsmasq_port" == "53" ]; then
@ -186,13 +176,10 @@ rm_port53()
 	config_editor "dns.port" "$dnsmasq_port" "$configpath"
 	uci set dhcp.@dnsmasq[0].port="53"
 	uci commit dhcp
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
-	killall -9 $binpath
 	/etc/init.d/dnsmasq restart
 }

-use_port53()
-{
+use_port53() {
 	local AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
 	dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
 	if [ -z "$dnsmasq_port" ]; then
@ -208,17 +195,15 @@ use_port53()
 	config_editor "dns.port" "53" "$configpath"
 	uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT"
 	uci commit dhcp
-	/etc/init.d/dnsmasq reload
+	/etc/init.d/dnsmasq restart
 }

-do_redirect()
-{
+do_redirect() {
 	config_load "${CONFIGURATION}"
 	_do_redirect $1
 }

-_do_redirect()
-{
+_do_redirect() {
 	local section="$CONFIGURATION"
 	args=""
 	ipv6_server=1
@ -231,9 +216,6 @@ _do_redirect()
 	fi
 	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
 	AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
-	if [ ! -s "$configpath" ]; then
-		cp -f /usr/share/AdGuardHome/AdGuardHome_template.yaml $configpath
-	fi
 	if [ -z "$AdGuardHome_PORT" ]; then
 		AdGuardHome_PORT="0"
 	fi
@ -242,6 +224,7 @@ _do_redirect()
 	config_get "old_port" "$section" "old_port" "0"
 	config_get "old_enabled" "$section" "old_enabled" "0"
 	uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1
+	uci commit dhcp
 	if [ "$old_enabled" = "1" -a "$old_redirect" == "exchange" ]; then
 		AdGuardHome_PORT=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
 	fi
@ -249,7 +232,7 @@ _do_redirect()
 	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$AdGuardHome_PORT" ] || [ "$old_enabled" = "1" -a "$enabled" = "0" ]; then
 		if [ "$old_redirect" != "none" ]; then
 			if [  "$old_redirect" == "redirect" -a "$old_port" != "0" ]; then
-				clear_iptable "$old_port" "$ipv6_server"
+				clear_iptable
 			elif [ "$old_redirect" == "dnsmasq-upstream" ]; then
 				stop_forward_dnsmasq "$old_port"
 			elif [ "$old_redirect" == "exchange" ]; then
@ -258,7 +241,7 @@ _do_redirect()
 		fi
 	elif [ "$old_enabled" = "1" -a "$enabled" = "1" ]; then
 		if [  "$old_redirect" == "redirect" -a "$old_port" != "0" ]; then
-			clear_iptable "$old_port" "$ipv6_server"
+			clear_iptable
 		fi
 	fi
 	uci delete AdGuardHome.@AdGuardHome[0].old_redirect 2>/dev/null
@ -281,8 +264,7 @@ _do_redirect()
 	fi
 }

-get_filesystem()
-{
+get_filesystem() {
 # print out path filesystem
    echo $1 | awk '
    BEGIN{
@ -350,7 +332,7 @@ boot_service() {
 	config_load "${CONFIGURATION}"
 	config_get waitonboot $CONFIGURATION waitonboot "0"
 	config_get_bool enabled $CONFIGURATION enabled 0
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
 	[ -f "$binpath" ] && start_service
 	if [ "$enabled" == "1" ] && [ "$waitonboot" == "1" ]; then
 		procd_open_instance "waitnet"
@ -360,7 +342,7 @@ boot_service() {
 	fi
 }

-testbackup(){
+testbackup() {
 	config_load "${CONFIGURATION}"
 	if [ "$1" == "backup" ]; then
 		backup
@ -369,17 +351,16 @@ testbackup(){
 	fi
 }

-restore()
-{
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
-	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+restore() {
+	config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome"
+	config_get backupwdpath $CONFIGURATION backupwdpath "/usr/bin/AdGuardHome"
 	cp -u -r -f $backupwdpath/data $workdir
 }

 backup() {
-	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+	config_get backupwdpath $CONFIGURATION backupwdpath "/usr/bin/AdGuardHome"
 	mkdir -p $backupwdpath/data
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome"
 	config_get backupfile $CONFIGURATION backupfile ""
 	for one in $backupfile;
 	do
@ -393,7 +374,7 @@ backup() {
 			echo "$cpret"
 			echo "$cpret" | grep "no space left on device"
 			if [ "$?" == "0" ]; then
-				echo "磁盘已满,删除log重试中"
+				echo "磁盘空间已满,删除 log 文件重试中 ..."
 				del_querylog && continue
 				rm -f -r $backupwdpath/data/filters
 				rm -f -r $workdir/data/filters && continue
@ -411,6 +392,7 @@ start_service() {
 	# update password
 	config_get hashpass $CONFIGURATION hashpass ""
 	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+	[ -f $configpath ] && chmod 777 $configpath
 	if [ -n "$hashpass" ]; then
 		config_editor "users.password" "$hashpass" "$configpath"
 		uci set $CONFIGURATION.$CONFIGURATION.hashpass=""
@ -424,32 +406,31 @@ start_service() {
 		return
 	fi
 	#what need to do before reload
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome"

 	config_get backupfile $CONFIGURATION backupfile ""
 	mkdir -p $workdir/data
 	if [ -n "$backupfile" ] && [ ! -d "$workdir/data" ]; then
 		restore
 	fi
-	# for overlay data-stk-oo not suppport
 	local cwdfs=$(get_filesystem $workdir)
-	echo "workdir is a $cwdfs filesystem"
+	echo "文件系统: ${cwdfs}"
 	if [ "$cwdfs" == "jffs2" ]; then
 		echo "fs error ln db to tmp $workdir $cwdfs"
 		logger "AdGuardHome" "warning db redirect to tmp"
 		touch $workdir/data/stats.db
 		if [ ! -L $workdir/data/stats.db ]; then
-		mv -f $workdir/data/stats.db /tmp/stats.db 2>/dev/null
-		ln -s /tmp/stats.db $workdir/data/stats.db 2>/dev/null
+			mv -f $workdir/data/stats.db /tmp/stats.db 2>/dev/null
+			ln -s /tmp/stats.db $workdir/data/stats.db 2>/dev/null
 		fi
 		touch $workdir/data/sessions.db
 		if [ ! -L $workdir/data/sessions.db ]; then
-		mv -f $workdir/data/sessions.db /tmp/sessions.db 2>/dev/null
-		ln -s /tmp/sessions.db $workdir/data/sessions.db 2>/dev/null
+			mv -f $workdir/data/sessions.db /tmp/sessions.db 2>/dev/null
+			ln -s /tmp/sessions.db $workdir/data/sessions.db 2>/dev/null
 		fi
 	fi
 	local ADDITIONAL_ARGS=""
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"

 	mkdir -p ${binpath%/*}
 	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -c $configpath"
@ -460,8 +441,8 @@ start_service() {
 	# hack to save config file when upgrade system
 	config_get upprotect $CONFIGURATION upprotect ""
 	eval upprotect=${upprotect// /\\\\n}
-	echo -e "$upprotect">/lib/upgrade/keep.d/luci-app-adguardhome
-
+	echo -e "$upprotect" > /lib/upgrade/keep.d/luci-app-adguardhome
+	
 	config_get logfile $CONFIGURATION logfile ""
 	if [ -n "$logfile" ]; then
 		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -l $logfile"
@ -471,6 +452,8 @@ start_service() {
 		_do_redirect 0
 		/usr/share/AdGuardHome/update_core.sh 2>&1 >/tmp/AdGuardHome_update.log &
 		exit 0
+	else
+		chmod 777 $binpath
 	fi

 	config_get_bool verbose $CONFIGURATION verbose 0
@ -501,24 +484,17 @@ start_service() {
 			echo "no config start watching"
 		fi
 	fi
-	echo "AdGuardHome service enabled"
-	echo "luci enable switch=$enabled"
+	echo "AdGuardHome 服务已启用"
 	(sleep 10 && [ -z "$(pgrep $binpath)" ] && logger "AdGuardHome" "no process in 10s cancel redirect" && _do_redirect 0 )&
-	if [[ "`uci get bypass.@global[0].global_server 2>/dev/null`" && "`uci get bypass.@global[0].adguardhome 2>/dev/null`" == 1 && "$(uci get dhcp.@dnsmasq[0].port)" == "53" ]]; then
-	 uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
-	 uci commit AdGuardHome
-	 do_redirect 1
-	fi
 }

-reload_service()
-{
+reload_service() {
 	rm /var/run/AdGlucitest >/dev/null 2>&1
-	echo "AdGuardHome reloading"
+	echo "重载 AdGuardHome 服务..."
 	start
 }

-del_querylog(){
+del_querylog() {
 	local btarget=$(ls $backupwdpath/data | grep -F "querylog.json" | sort -r | head -n 1)
 	local wtarget=$(ls $workdir/data | grep -F "querylog.json" | sort -r | head -n 1)
 	if [ "$btarget"x == "$wtarget"x ]; then
@ -535,9 +511,7 @@ del_querylog(){
 		return 0
 	fi
 }
-
-stop_service()
-{
+stop_service() {
 	config_load "${CONFIGURATION}"
 	_do_redirect 0
 	do_crontab
@ -547,7 +521,7 @@ stop_service()
 			backup
 		fi
 	fi
-	echo "AdGuardHome service disabled"
+	echo "AdGuardHome 服务已停止"
 	touch /var/run/AdGserverdis
 }

@ -557,13 +531,12 @@ boot() {
 		service_started
 	fi
 }
-
-test_crontab(){
+test_crontab() {
 	config_load "${CONFIGURATION}"
 	do_crontab
 }

-do_crontab(){
+do_crontab() {
 	config_get_bool enabled $CONFIGURATION enabled 0
 	config_get crontab $CONFIGURATION crontab ""
 	local findstr default cronenable replace commit
@ -573,16 +546,16 @@ do_crontab(){
 	default="30 3 * * * /usr/share/AdGuardHome/update_core.sh 2>&1"
 	[ "$enabled" == "0" ] || [ "${crontab//autoupdate/}" == "$crontab" ] && cronenable=0 || cronenable=1
 	crontab_editor
-
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
-	config_get lastworkdir $CONFIGURATION lastworkdir "/etc/AdGuardHome"
+	
+	config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome"
+	config_get lastworkdir $CONFIGURATION lastworkdir "/usr/bin/AdGuardHome"
 	findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
 	#[ -n "$lastworkdir" ] && findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* $lastworkdir/data/querylog.json" && [ "$lastworkdir" != "$workdir" ] && replace="${lastworkdir//\//\\/}/${workdir//\//\\/}"
 	default="0 * * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
 	[ "$enabled" == "0" ] || [ "${crontab//cutquerylog/}" == "$crontab" ] && cronenable=0 || cronenable=1
 	crontab_editor
 	#[ "$lastworkdir" != "$workdir" ] && uci set AdGuardHome.AdGuardHome.lastworkdir="$workdir" && commit=1
-
+	
 	config_get logfile $CONFIGURATION logfile ""
 	config_get lastlogfile $CONFIGURATION lastlogfile ""
 	findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.logfile)"
@ -591,7 +564,7 @@ do_crontab(){
 	[ "$logfile" == "syslog" ] || [ "$logfile" == "" ] || [ "$enabled" == "0" ] || [ "${crontab//cutruntimelog/}" == "$crontab" ] && cronenable=0 || cronenable=1
 	crontab_editor
 	#[ -n "$logfile" ] && [ "$lastlogfile" != "$logfile" ] && uci set AdGuardHome.AdGuardHome.lastlogfile="$logfile" && commit=1
-
+	
 	findstr="/usr/share/AdGuardHome/addhost.sh"
 	default="0 * * * * /usr/share/AdGuardHome/addhost.sh"
 	[ "$enabled" == "0" ] || [ "${crontab//autohost/}" == "$crontab" ] && cronenable=0 || cronenable=1
@ -605,8 +578,7 @@ do_crontab(){
 	[ "$cronreload" -gt 0 ] && /etc/init.d/cron restart
 	#[ "$commit" -gt 0 ] && uci commit AdGuardHome
 }
-
-crontab_editor(){
+crontab_editor() {
 	#usage input:
 	#findstr=
 	#default=
@ -615,7 +587,7 @@ crontab_editor(){
 	#output:cronreload:if >1 please /etc/init.d/cron restart manual
 	local testline reload
 	local line="$(grep "$findstr" $CRON_FILE)"
-	[ -n "$replace" ] && [ -n "$line" ] && eval testline="\${line//$replace}" && [ "$testline" != "$line" ] && line="$testline" && reload="1" && replace=""
+	[ -n "$replace" ] && [ -n "$line" ] && eval testline="\${line//$replace}" && [ "$testline" != "$line" ] && line="$testline" && reload="1" && replace="" 
 	if [ "${line:0:1}" != "#" ]; then
 		if [ $cronenable -eq 1 ]; then
 			[ -z "$line" ] && line="$default" && reload="1"
@ -639,4 +611,5 @@ crontab_editor(){
 			echo "$line" >> $CRON_FILE
 		fi
 	fi
+	
 }
--- a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
+++ b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
@ -6,10 +6,7 @@ uci -q batch <<-EOF >/dev/null 2>&1
 	set ucitrack.@AdGuardHome[-1].init=AdGuardHome
 	commit ucitrack
 	delete AdGuardHome.AdGuardHome.ucitracktest
-	/etc/init.d/AdGuardHome restart
 EOF

 rm -f /tmp/luci-indexcache
-
-chmod +x /etc/init.d/AdGuardHome /usr/share/AdGuardHome/*
 exit 0
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
@ -1,59 +1,61 @@
+# 使用本模板，点击下方 [保存&应用] 就可以开始正常使用 AdGuardHome 服务
+# Enhanced by Hyy2001
+
 bind_host: 0.0.0.0
 bind_port: 3000
 beta_bind_port: 0
 users:
 - name: root
-  password: $2y$10$dwn0hTYoECQMZETBErGlzOId2VANOVsPHsuH13TM/8KnysM5Dh/ve
+  password: $2a$10$rYaGunOdH6N62SDycg3rQO1POzr39lXF8vHZ/28wkJq3RY69DJYT2
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""
-language: zh-cn
+language: ""
+rlimit_nofile: 0
 debug_pprof: false
 web_session_ttl: 720
 dns:
-  bind_host: 0.0.0.0
-  port: 1745
-  statistics_interval: 30
+  bind_hosts:
+  - 0.0.0.0
+  port: 5553
+  statistics_interval: 90
  querylog_enabled: true
  querylog_file_enabled: true
-  querylog_interval: 6h
+  querylog_interval: 1
  querylog_size_memory: 1000
  anonymize_client_ip: false
  protection_enabled: true
  blocking_mode: default
  blocking_ipv4: ""
  blocking_ipv6: ""
-  blocked_response_ttl: 60
+  blocked_response_ttl: 10
  parental_block_host: family-block.dns.adguard.com
  safebrowsing_block_host: standard-block.dns.adguard.com
  ratelimit: 0
  ratelimit_whitelist: []
-  refuse_any: false
+  refuse_any: true
  upstream_dns:
+  - https://dns.alidns.com/dns-query
+  - tls://dns.alidns.com
+  - 114.114.114.114
  - 223.5.5.5
  upstream_dns_file: ""
  bootstrap_dns:
-  - 119.29.29.29
-  - 223.5.5.5
-  all_servers: false
+#bootstrap_dns
+  all_servers: true
  fastest_addr: false
-  fastest_timeout: 1s
  allowed_clients: []
  disallowed_clients: []
  blocked_hosts:
  - version.bind
  - id.server
  - hostname.bind
-  trusted_proxies:
-  - 127.0.0.0/8
-  - ::1/128
  cache_size: 4194304
  cache_ttl_min: 0
  cache_ttl_max: 0
-  cache_optimistic: true
  bogus_nxdomain: []
-  aaaa_disabled: false
-  enable_dnssec: false
+  aaaa_disabled: true
+  enable_dnssec: true
  edns_client_subnet: false
  max_goroutines: 300
  ipset: []
@ -68,10 +70,8 @@ dns:
  cache_time: 30
  rewrites: []
  blocked_services: []
-  upstream_timeout: 10s
  local_domain_name: lan
-  resolve_clients: true
-  use_private_ptr_resolvers: true
+  resolve_clients: false
  local_ptr_upstreams: []
 tls:
  enabled: false
@ -91,21 +91,24 @@ tls:
 filters:
 - enabled: true
  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
-  name: AdGuard DNS filter
-  id: 1628750870
+  name: AdGuard Home
+  id: 1
 - enabled: true
+  url: https://banbendalao.coding.net/p/adgk/d/ADgk/git/raw/master/ADgk.txt
+  name: AD-gk
+  id: 2
+- enabled: false
  url: https://anti-ad.net/easylist.txt
-  name: 'CHN: anti-AD'
-  id: 1628750871
+  name: anti-AD
+  id: 4
+- enabled: true
+  url: https://raw.githubusercontent.com/o0HalfLife0o/list/master/ad.txt
+  name: HalfLife
+  id: 5
 whitelist_filters: []
 user_rules:
- '@@||taobao.com^$important'
- '@@||jd.com^important'
- '@@||flyme.cn^$important'
- '@@||meizu.com^$important'
- '@@||wl.jd.com^$important'
- '@@||flydigi.com^'
- '@@||pv.sohu.com^$important'
+- '@@||iwx.mail.qq.com^$important'
+- '@@||gm.mmstat.com^$important'
 dhcp:
  enabled: false
  interface_name: ""
@ -130,4 +133,4 @@ log_max_size: 100
 log_max_age: 3
 log_file: ""
 verbose: false
-schema_version: 7
+schema_version: 10
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
@ -1,5 +1,4 @@
 #!/bin/sh
-
 checkmd5(){
 local nowmd5=$(md5sum /etc/hosts)
 nowmd5=${nowmd5%% *}
@ -10,7 +9,6 @@ if [ "$nowmd5" != "$lastmd5" ]; then
 	[ "$1" == "noreload" ] || /etc/init.d/AdGuardHome reload
 fi
 }
-
 [ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' /etc/hosts && checkmd5 "$2" && exit 0
 /usr/bin/awk 'BEGIN{
 while ((getline < "/tmp/dhcp.leases") > 0)
@ -32,4 +30,4 @@ else
 	cat /tmp/tmphost >> /etc/hosts
 fi
 rm /tmp/tmphost
-checkmd5 "$2"
+checkmd5 "$2"
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
@ -1,5 +1,4 @@
 #!/bin/sh
-
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 logread -e AdGuardHome > /tmp/AdGuardHometmp.log
 logread -e AdGuardHome -f >> /tmp/AdGuardHometmp.log &
@ -17,4 +16,4 @@ do
 	else
 		echo "0">/var/run/AdGuardHomesyslog
 	fi
-done
+done
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
@ -1,7 +1,5 @@
 #!/bin/sh
-
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-
 checkmd5(){
 local nowmd5=$(md5sum /tmp/adguard.list 2>/dev/null)
 nowmd5=${nowmd5%% *}
@ -12,7 +10,6 @@ if [ "$nowmd5" != "$lastmd5" ]; then
 	[ "$1" == "noreload" ] || /etc/init.d/AdGuardHome reload
 fi
 }
-
 configpath=$(uci get AdGuardHome.AdGuardHome.configpath 2>/dev/null)
 [ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' $configpath && checkmd5 "$2" && exit 0
 gfwupstream=$(uci get AdGuardHome.AdGuardHome.gfwupstream 2>/dev/null)
@ -86,4 +83,4 @@ else
 	sed -i '/upstream_dns:/'r/tmp/adguard.list $configpath
 fi
 checkmd5 "$2"
-rm -f /tmp/gfwlist.txt /tmp/adguard.list
+rm -f /tmp/gfwlist.txt /tmp/adguard.list
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
@ -1,3 +1,4 @@
-https://github.com/AdguardTeam/AdGuardHome/releases/download/${latest_ver}/AdGuardHome_linux_${Arch}.tar.gz
-https://static.adguard.com/adguardhome/release/AdGuardHome_linux_${Arch}.tar.gz
-https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_${Arch}.tar.gz
+https://github.com/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz
+https://hub.fastgit.xyz/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz
+#https://static.adguard.com/adguardhome/release/AdGuardHome_linux_${Arch}.tar.gz
+#https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_${Arch}.tar.gz
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
@ -1,5 +1,4 @@
 #!/bin/sh
-
 tail -n $1 "$2" > /var/run/tailtmp
 cat /var/run/tailtmp > "$2"
-rm /var/run/tailtmp
+rm /var/run/tailtmp
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
@ -1,239 +1,217 @@
-#!/bin/sh
+#!/bin/bash
+
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+update_mode=$1
 binpath=$(uci get AdGuardHome.AdGuardHome.binpath)
-if [ -z "$binpath" ]; then
-uci set AdGuardHome.AdGuardHome.binpath="/usr/bin/AdGuardHome"
-binpath="/usr/bin/AdGuardHome"
+if [[ -z ${binpath} ]]; then
+	uci set AdGuardHome.AdGuardHome.binpath="/tmp/AdGuardHome/AdGuardHome"
+	binpath="/tmp/AdGuardHome/AdGuardHome"
 fi
-mkdir -p ${binpath%/*}
+[[ ! -d ${binpath%/*} ]] && mkdir -p ${binpath%/*}
 upxflag=$(uci get AdGuardHome.AdGuardHome.upxflag 2>/dev/null)
-LOCKU=/var/lock/AdGuardHome-update.lock
-[ -f $LOCKU ] && EXIT 1
-touch $LOCKU
+[[ -z ${upxflag} ]] && upxflag=off
+enabled=$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)
+core_version=$(uci get AdGuardHome.AdGuardHome.core_version 2>/dev/null)
+update_url=$(uci get AdGuardHome.AdGuardHome.update_url 2>/dev/null)

-check_if_already_running(){
+case "${core_version}" in
+beta)
+	core_api_url=https://api.github.com/repos/AdguardTeam/AdGuardHome/releases
+;;
+*)
+	core_api_url=https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest
+;;
+esac

-	running_tasks=$(ps |grep 'AdGuardHome' |grep 'update_core' |grep -v 'grep' |awk '{print $1}' |wc -l)
-	[ "x${running_tasks}" != "x0" ] && echo -e "\nA task is already running."  && EXIT 2
+Check_Task(){
+	running_tasks="$(ps -efww  | grep -v grep | grep "AdGuardHome" | grep "update_core" | awk '{print $1}' | wc -l)"
+	case $1 in
+	force)
+		echo -e "执行: 强制更新核心"
+		echo -e "清除 ${running_tasks} 个进程 ..."
+		ps -efww  | grep -v grep | grep -v $$ | grep "AdGuardHome" | grep "update_core" | awk '{print $1}' | xargs kill -9 2> /dev/null
+	;;
+	*)
+		[[ ${running_tasks} -gt 2 ]] && echo -e "已经有 ${running_tasks} 个任务正在运行, 请等待其执行结束或将其强行停止!" && EXIT 2
+	;;
+	esac
 }

-check_wgetcurl(){
-	which curl && downloader="curl -L -k --retry 2 --connect-timeout 20 -o" && return
-	which wget-ssl && downloader="wget-ssl --no-check-certificate -t 2 -T 20 -O" && return
-	[ -z "$1" ] && opkg update || (echo error opkg && EXIT 1)
-	[ -z "$1" ] && (opkg remove wget wget-nossl --force-depends ; opkg install wget ; check_wgetcurl 1 ;return)
-	[ "$1" == "1" ] && (opkg install curl ; check_wgetcurl 2 ; return)
-	echo error curl and wget && EXIT 1
+Check_Downloader(){
+	which curl > /dev/null 2>&1 && PKG="curl" && return
+	echo -e "\n未安装 curl"
+	which wget-ssl > /dev/null 2>&1 && PKG="wget-ssl" && return
+	echo "未安装 curl 和 wget, 无法检测更新!" && EXIT 1
 }

-check_latest_version(){
-	check_wgetcurl
-	latest_ver="$($downloader - https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest 2>/dev/null|grep -E 'tag_name' |grep -E 'v[0-9.]+' -o 2>/dev/null)"
-	if [ -z "${latest_ver}" ]; then
-		echo -e "\nFailed to check latest version, please try again later."  && EXIT 1
-	fi
-	now_ver="$($binpath -c /dev/null --check-config 2>&1| grep -m 1 -E 'v[0-9.]+' -o)"
-	if [ "${latest_ver}"x != "${now_ver}"x ] || [ "$1" == "force" ]; then
-		echo -e "Local version: ${now_ver}., cloud version: ${latest_ver}."
-		doupdate_core
+Check_Updates(){
+	Check_Downloader
+	case "${PKG}" in
+	curl)
+		Downloader="curl -L -k -o"
+		_Downloader="curl -s"
+	;;
+	wget-ssl)
+		Downloader="wget-ssl --no-check-certificate -T 5 -O"
+		_Downloader="wget-ssl -q -O -"
+	;;
+	esac
+	echo "[${PKG}] 开始检查更新, 请耐心等待 ..."
+	Cloud_Version="$(${_Downloader} ${core_api_url} 2>/dev/null | grep 'tag_name' | egrep -o "v[0-9].+[0-9.]" | awk 'NR==1')"
+	[[ -z ${Cloud_Version} ]] && echo -e "\n检查更新失败, 请检查网络或稍后重试!" && EXIT 1
+	if [[ -f ${binpath} ]]; then
+		Current_Version="$(${binpath} --version 2>/dev/null | egrep -o "v[0-9].+[0-9]" | sed -r 's/(.*), c(.*)/\1/')"
 	else
-		echo -e "\nLocal version: ${now_ver}, cloud version: ${latest_ver}."
-		echo -e "You're already using the latest version."
-		if [ ! -z "$upxflag" ]; then
-			filesize=$(ls -l $binpath | awk '{ print $5 }')
-			if [ $filesize -gt 8000000 ]; then
-				echo -e "start upx may take a long time"
-				doupx
-				mkdir -p "/tmp/AdGuardHomeupdate/AdGuardHome" >/dev/null 2>&1
-				rm -fr /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/}
-				/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx $upxflag $binpath -o /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/}
-				rm -rf /tmp/upx-${upx_latest_ver}-${Arch}_linux
-				/etc/init.d/AdGuardHome stop nobackup
-				rm $binpath
-				mv -f /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/} $binpath
-				/etc/init.d/AdGuardHome start
-				echo -e "finished"
-			fi
-		fi
+		Current_Version="未知"
+	fi
+	[[ -z ${Current_Version} ]] && Current_Version="未知"
+	echo -e "\n执行文件路径: ${binpath%/*}\n\n正在检查更新, 请耐心等待 ..."
+	echo -e "\n当前 AdGuardHome 版本: ${Current_Version}\n云端 AdGuardHome 版本: ${Cloud_Version}"
+	if [[ ! "${Cloud_Version}" == "${Current_Version}" || "$1" == force ]]; then
+		Update_Core
+	else
+		echo -e "\n已是最新版本, 无需更新!" 
 		EXIT 0
 	fi
-}
-
-doupx(){
-	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
-	case $Archt in
-	"i386")
-		Arch="i386"
-		;;
-	"i686")
-		Arch="i386"
-		echo -e "i686 use $Arch may have bug"
-		;;
-	"x86")
-		Arch="amd64"
-		;;
-	"mipsel")
-		Arch="mipsel"
-		;;
-	"mips64el")
-		Arch="mips64el"
-		Arch="mipsel"
-		echo -e "mips64el use $Arch may have bug"
-		;;
-	"mips")
-		Arch="mips"
-		;;
-	"mips64")
-		Arch="mips64"
-		Arch="mips"
-		echo -e "mips64 use $Arch may have bug"
-		;;
-	"arm")
-		Arch="arm"
-		;;
-	"armeb")
-		Arch="armeb"
-		;;
-	"aarch64")
-		Arch="arm64"
-		;;
-	"powerpc")
-		Arch="powerpc"
-		;;
-	"powerpc64")
-		Arch="powerpc64"
-		;;
-	*)
-		echo -e "error not support $Archt if you can use offical release please issue a bug"
-		EXIT 1
-		;;
-	esac
-	upx_latest_ver="$($downloader - https://api.github.com/repos/upx/upx/releases/latest 2>/dev/null|grep -E 'tag_name' |grep -E '[0-9.]+' -o 2>/dev/null)"
-	$downloader /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz "https://github.com/upx/upx/releases/download/v${upx_latest_ver}/upx-${upx_latest_ver}-${Arch}_linux.tar.xz" 2>&1
-	#tar xvJf
-	which xz || (opkg list | grep ^xz || opkg update && opkg install xz) || (echo "xz download fail" && EXIT 1)
-	mkdir -p /tmp/upx-${upx_latest_ver}-${Arch}_linux
-	xz -d -c /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz| tar -x -C "/tmp" >/dev/null 2>&1
-	if [ ! -e "/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx" ]; then
-		echo -e "Failed to download upx."
-		EXIT 1
-	fi
-	rm /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz
-}
-
-doupdate_core(){
-	echo -e "Updating core..."
-	mkdir -p "/tmp/AdGuardHomeupdate"
-	rm -rf /tmp/AdGuardHomeupdate/* >/dev/null 2>&1
-	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
-	case $Archt in
-	"i386")
-		Arch="386"
-		;;
-	"i686")
-		Arch="386"
-		;;
-	"x86")
-		Arch="amd64"
-		;;
-	"mipsel")
-		Arch="mipsle"
-		;;
-	"mips64el")
-		Arch="mips64le"
-		Arch="mipsle"
-		echo -e "mips64el use $Arch may have bug"
-		;;
-	"mips")
-		Arch="mips"
-		;;
-	"mips64")
-		Arch="mips64"
-		Arch="mips"
-		echo -e "mips64 use $Arch may have bug"
-		;;
-	"arm")
-		Arch="arm"
-		;;
-	"aarch64")
-		Arch="arm64"
-		;;
-	"powerpc")
-		Arch="ppc"
-		echo -e "error not support $Archt"
-		EXIT 1
-		;;
-	"powerpc64")
-		Arch="ppc64"
-		echo -e "error not support $Archt"
-		EXIT 1
-		;;
-	*)
-		echo -e "error not support $Archt if you can use offical release please issue a bug"
-		EXIT 1
-		;;
-	esac
-	echo -e "start download"
-	grep -v "^#" /usr/share/AdGuardHome/links.txt >/tmp/run/AdHlinks.txt
-	while read link
-	do
-		eval link="$link"
-		$downloader /tmp/AdGuardHomeupdate/${link##*/} "$link" 2>&1
-		if [ "$?" != "0" ]; then
-			echo "download failed try another download"
-			rm -f /tmp/AdGuardHomeupdate/${link##*/}
-		else
-			local success="1"
-			break
-		fi
-	done < "/tmp/run/AdHlinks.txt"
-	rm /tmp/run/AdHlinks.txt
-	[ -z "$success" ] && echo "no download success" && EXIT 1
-	if [ "${link##*.}" == "gz" ]; then
-		tar -zxf "/tmp/AdGuardHomeupdate/${link##*/}" -C "/tmp/AdGuardHomeupdate/"
-		if [ ! -e "/tmp/AdGuardHomeupdate/AdGuardHome" ]; then
-			echo -e "Failed to download core."
-			rm -rf "/tmp/AdGuardHomeupdate" >/dev/null 2>&1
-			EXIT 1
-		fi
-		downloadbin="/tmp/AdGuardHomeupdate/AdGuardHome/AdGuardHome"
-	else
-		downloadbin="/tmp/AdGuardHomeupdate/${link##*/}"
-	fi
-	chmod 755 $downloadbin
-	echo -e "download success start copy"
-	if [ -n "$upxflag" ]; then
-		echo -e "start upx may take a long time"
-		doupx
-		/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx $upxflag $downloadbin
-		rm -rf /tmp/upx-${upx_latest_ver}-${Arch}_linux
-	fi
-	echo -e "start copy"
-	/etc/init.d/AdGuardHome stop nobackup
-	rm "$binpath"
-	mv -f "$downloadbin" "$binpath"
-	if [ "$?" == "1" ]; then
-		echo "mv failed maybe not enough space please use upx or change bin to /tmp/AdGuardHome"
-		EXIT 1
-	fi
-	/etc/init.d/AdGuardHome start
-	rm -rf "/tmp/AdGuardHomeupdate" >/dev/null 2>&1
-	echo -e "Succeeded in updating core."
-	echo -e "Local version: ${latest_ver}, cloud version: ${latest_ver}.\n"
 	EXIT 0
 }

+UPX_Compress(){
+	GET_Arch
+	upx_name="upx-${upx_latest_ver}-${Arch_upx}_linux.tar.xz"
+	echo -e "开始下载 ${upx_name} ...\n"
+	$Downloader /tmp/upx-${upx_latest_ver}-${Arch_upx}_linux.tar.xz "https://github.com/upx/upx/releases/download/v${upx_latest_ver}/${upx_name}"
+	if [[ ! -e /tmp/upx-${upx_latest_ver}-${Arch_upx}_linux.tar.xz ]]; then
+		echo -e "\n${upx_name} 下载失败!\n" 
+		EXIT 1
+	else
+		echo -e "\n${upx_name} 下载成功!\n" 
+	fi
+	which xz > /dev/null 2>&1 || (opkg list | grep ^xz || opkg update > /dev/null 2>&1 && opkg install xz --force-depends) || (echo "软件包 xz 安装失败!" && EXIT 1)
+	mkdir -p /tmp/upx-${upx_latest_ver}-${Arch_upx}_linux
+	echo -e "正在解压 ${upx_name} ...\n" 
+	xz -d -c /tmp/upx-${upx_latest_ver}-${Arch_upx}_linux.tar.xz | tar -x -C "/tmp"
+	[[ ! -f /tmp/upx-${upx_latest_ver}-${Arch_upx}_linux/upx ]] && echo -e "\n${upx_name} 解压失败!" && EXIT 1
+}
+
+Update_Core(){
+	rm -r /tmp/AdGuardHome_Update > /dev/null 2>&1
+	mkdir -p "/tmp/AdGuardHome_Update"
+	GET_Arch
+	eval link="${update_url}"
+	echo -e "下载链接:${link}"
+	echo -e "文件名称:${link##*/}"
+	echo -e "\n开始下载 AdGuardHome 核心文件 ...\n" 
+	$Downloader /tmp/AdGuardHome_Update/${link##*/} ${link}
+	if [[ $? != 0 ]];then
+		echo -e "\nAdGuardHome 核心下载失败 ..."
+		rm -r /tmp/AdGuardHome_Update
+		EXIT 1
+	fi 
+	if [[ ${link##*.} == gz ]]; then
+		echo -e "\n正在解压 AdGuardHome ..."
+		tar -zxf "/tmp/AdGuardHome_Update/${link##*/}" -C "/tmp/AdGuardHome_Update/"
+		if [[ ! -e /tmp/AdGuardHome_Update/AdGuardHome ]]
+		then
+			echo "AdGuardHome 核心解压失败!" 
+			rm -rf "/tmp/AdGuardHome_Update" > /dev/null 2>&1
+			EXIT 1
+		fi
+		downloadbin="/tmp/AdGuardHome_Update/AdGuardHome/AdGuardHome"
+	else
+		downloadbin="/tmp/AdGuardHome_Update/${link##*/}"
+	fi
+	chmod +x ${downloadbin}
+	echo -e "\nAdGuardHome 核心体积: $(awk 'BEGIN{printf "%.2fMB\n",'$((`ls -l $downloadbin | awk '{print $5}'`))'/1000000}')"
+	if [[ ${upxflag} != off ]]; then
+		UPX_Compress
+		echo -e "使用 UPX 压缩可能会花很长时间, 期间请耐心等待!\n正在压缩 $downloadbin ..."
+		/tmp/upx-${upx_latest_ver}-${Arch_upx}_linux/upx $upxflag $downloadbin > /dev/null 2>&1
+		echo -e "\n压缩后的核心体积: $(awk 'BEGIN{printf "%.2fMB\n",'$((`ls -l $downloadbin | awk '{print $5}'`))'/1000000}')"
+	else
+		echo "未启用 UPX 压缩, 跳过操作..."
+	fi
+	/etc/init.d/AdGuardHome stop > /dev/null 2>&1
+	echo -e "\n移动 AdGuardHome 核心文件到 ${binpath%/*} ..."
+	mv -f ${downloadbin} ${binpath} > /dev/null 2>&1
+	if [[ ! -s ${binpath} && $? != 0 ]]; then
+		echo -e "AdGuardHome 核心移动失败!\n可能是设备空间不足导致, 请尝试开启 UPX 压缩, 或更改 [执行文件路径] 为 /tmp/AdGuardHome" 
+		EXIT 1
+	fi
+	rm -f /tmp/upx*.tar.xz
+	rm -rf /tmp/upx*	
+	rm -rf /tmp/AdGuardHome_Update
+	chmod +x ${binpath}
+	if [[ ${enabled} == 1 ]]; then
+		echo -e "\n正在重启 AdGuardHome 服务..."
+		/etc/init.d/AdGuardHome restart
+	fi
+	echo -e "\nAdGuardHome 核心更新成功!" 
+}
+
+GET_Arch() {
+	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
+	case "${Archt}" in
+	i386)
+		Arch=i386
+	;;
+	i686)
+		Arch=i386
+	;;
+	x86)
+		Arch=amd64
+	;;
+	mipsel)
+		Arch=mipsle_softfloat
+	;;
+	mips)
+		Arch=mips_softfloat
+	;;
+	mips64el)
+		Arch=mips64le_softfloat
+	;;
+	mips64)
+		Arch=mips64_softfloat
+	;;
+	arm)
+		Arch=arm
+	;;
+	armeb)
+		Arch=armeb
+	;;
+	aarch64)
+		Arch=arm64
+	;;
+	*)
+		echo -e "\nAdGuardHome 暂不支持当前的设备架构: [${Archt}]!" 
+		EXIT 1
+	esac
+	case "${Archt}" in
+	mipsel)
+		Arch_upx="mipsel"
+		upx_latest_ver="3.95"
+	;;
+	*)
+		Arch_upx="${Arch}"
+		upx_latest_ver="$(${_Downloader} https://api.github.com/repos/upx/upx/releases/latest 2>/dev/null | egrep 'tag_name' | egrep '[0-9.]+' -o 2>/dev/null)"
+	
+	esac
+	echo -e "\n当前设备架构: ${Arch}\n"
+}
+
 EXIT(){
-	rm /var/run/update_core  rm -rf $LOCKU 2>/dev/null
-	[ "$1" != "0" ] && touch /var/run/update_core_error
+	rm -rf /var/run/update_core 2>/dev/null
+	[[ $1 != 0 ]] && touch /var/run/update_core_error
 	exit $1
 }

 main(){
-	# check_if_already_running
-	check_latest_version $1
+	Check_Task ${update_mode}
+	Check_Updates ${update_mode}
 }
-	trap "EXIT 1" SIGTERM SIGINT
-	touch /var/run/update_core
-	rm /var/run/update_core_error 2>/dev/null
-	main $1
+
+trap "EXIT 1" SIGTERM SIGINT
+touch /var/run/update_core
+rm - rf /var/run/update_core_error 2>/dev/null
+
+main
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
@ -1,27 +1,26 @@
 #!/bin/sh
-
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 count=0
 while :
 do
 	ping -c 1 -W 1 -q www.baidu.com 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
+	if [ "$?" == 0 ]; then
 		/etc/init.d/AdGuardHome force_reload
 		break
 	fi
-	ping -c 1 -W 1 -q 202.108.22.5 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
+	ping -c 1 -W 1 -q 223.5.5.5 1>/dev/null 2>&1
+	if [ "$?" == 0 ]; then
 		/etc/init.d/AdGuardHome force_reload
 		break
 	fi
 	sleep 5
-	ping -c 1 -W 1 -q www.google.com 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
+	ping -c 1 -W 1 -q www.github.com 1>/dev/null 2>&1
+	if [ "$?" == 0 ]; then
 		/etc/init.d/AdGuardHome force_reload
 		break
 	fi
 	ping -c 1 -W 1 -q 8.8.8.8 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
+	if [ "$?" == 0 ]; then
 		/etc/init.d/AdGuardHome force_reload
 		break
 	fi
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
@ -1,5 +1,4 @@
 #!/bin/sh
-
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 configpath=$(uci get AdGuardHome.AdGuardHome.configpath)
 while :
@ -10,4 +9,4 @@ do
 		break
 	fi
 done
-return 0
+return 0
--- a/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
+++ b/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.css
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.css
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.js
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/indent-fold.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/indent-fold.js
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.css
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.css
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.js
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/theme/dracula.css
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/theme/dracula.css
--- a/luci-app-adguardhome/root/www/luci-static/resources/twin-bcrypt.min.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/twin-bcrypt.min.js
--- a/v2ray-core/Makefile
+++ b/v2ray-core/Makefile
@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=v2ray-core
-PKG_VERSION:=5.3.0
+PKG_VERSION:=5.4.0
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=8e97e2647cb1dee8aa7e71df276c56d74258b2d97bb490a362afa84bdf1b9e25
+PKG_HASH:=86be35461a9dc7d037e0045771d99f1eae284fdb7aa0818a6782d18b6b003fca

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE