🚀 Sync 2026-03-20 14:18:42

2026-07-27 02:11:19 +08:00 · 2026-03-20 14:18:42 +08:00 · 2026-03-20 14:18:42 +08:00 · 62640bad4a
commit 62640bad4a
parent 49965659db
81 changed files with 2797 additions and 975 deletions
--- a/dockerd/Config.in
+++ b/dockerd/Config.in
@ -15,6 +15,7 @@ config DOCKER_CGROUP_OPTIONS
 	select KERNEL_CGROUP_FREEZER
 	select KERNEL_NET_CLS_CGROUP
 	select KERNEL_CGROUP_NET_PRIO
+	select PACKAGE_cgroupfs-mount
 	help
 		Selects kernel options to enable CGroups V1.

--- a/dockerd/Makefile
+++ b/dockerd/Makefile
@ -1,8 +1,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dockerd
+PKG_FLAGS:=hold
 PKG_VERSION:=27.3.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

@ -34,6 +35,7 @@ define Package/dockerd
  TITLE:=Docker Community Edition Daemon
  URL:=https://www.docker.com/
  DEPENDS:=$(GO_ARCH_DEPENDS) \
+    +jsonfilter \
    +ca-certificates \
    +containerd \
    +iptables \
@ -160,10 +162,19 @@ define Package/dockerd/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/etc/config/dockerd $(1)/etc/config/dockerd

-	# Must be after systcl 11-br-netfilter.conf from kmod-br-netfilter
-	$(INSTALL_DIR) $(1)/etc/sysctl.d
-	$(INSTALL_DATA) ./files/etc/sysctl.d/sysctl-br-netfilter-ip.conf \
-		$(1)/etc/sysctl.d/12-br-netfilter-ip.conf
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/net
+	$(INSTALL_DATA) ./files/etc/hotplug.d/net/br-netfilter \
+		$(1)/etc/hotplug.d/net/10-docker-br-netfilter
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/etc/uci-defaults/16_docker-netifd-migrate2 \
+		$(1)/etc/uci-defaults/16_docker-netifd-migrate2
+	$(INSTALL_DATA) ./files/etc/uci-defaults/17_docker-fw4 \
+		$(1)/etc/uci-defaults/17_docker-fw4
+
+	$(INSTALL_DIR) $(1)/lib/fstab.d
+	$(INSTALL_DATA) ./files/lib/fstab.d/dockerd.sh $(1)/lib/fstab.d/dockerd.sh
+
 endef

 define Package/dockerd/postinst
--- a/dockerd/files/dockerd.init
+++ b/dockerd/files/dockerd.init
@ -3,8 +3,8 @@
 USE_PROCD=1
 START=99

-extra_command "uciadd" "<interface> <device> <zone> Add docker bridge configuration to network and firewall uci config"
-extra_command "ucidel" "<interface> <device> <zone> Delete docker bridge configuration from network and firewall uci config"
+extra_command "uciadd" "<ignored> <device> <zone> Add docker bridge configuration to firewall uci config"
+extra_command "ucidel" "<ignored> <device> <zone> Delete docker bridge configuration from firewall uci config"

 DOCKER_CONF_DIR="/tmp/dockerd"
 DOCKERD_CONF="${DOCKER_CONF_DIR}/daemon.json"
@ -17,94 +17,85 @@ json_add_array_string() {
 	json_add_string "" "${1}"
 }

-find_network_device() {
-	local device="${1}"
-	local device_section=""
-
-	check_device() {
-		local cfg="${1}"
-		local device="${2}"
-
-		local type name
-		config_get type "${cfg}" type
-		config_get name "${cfg}" name
-
-		[ "${type}" = "bridge" ] && [ "${name}" = "${device}" ] \
-			&& device_section="${cfg}"
-	}
-
-	config_load network
-	config_foreach check_device device "${device}"
-
-	echo "${device_section}"
-}
-
-boot() {
-	uciadd
-	rc_procd start_service
-}
-
 uciadd() {
 	local iface="${1}"
 	local device="${2}"
 	local zone="${3}"

-	[ -z "${iface}" ] && {
-		iface="docker"
+	[ -z "${device}" ] && {
 		device="docker0"
 		zone="docker"
 	}

-	/etc/init.d/dockerd running && {
-		echo "Please stop dockerd service first"
-		exit 0
-	}
-
-	# Add network interface
-	if ! uci_quiet get network.${iface}; then
-		logger -t "dockerd-init" -p notice "Adding interface '${iface}' to network config"
-		uci_quiet add network interface
-		uci_quiet rename network.@interface[-1]="${iface}"
-		uci_quiet set network.@interface[-1].device="${device}"
-		uci_quiet set network.@interface[-1].proto="none"
-		uci_quiet set network.@interface[-1].auto="0"
-		uci_quiet commit network
-	fi
-
-	# Add docker bridge device
-	if [ "$(find_network_device "$device")" = "" ]; then
-		logger -t "dockerd-init" -p notice "Adding bridge device '${device}' to network config"
-		uci_quiet add network device
-		uci_quiet set network.@device[-1].type="bridge"
-		uci_quiet set network.@device[-1].name="${device}"
-		uci_quiet commit network
-	else
-		logger -t "dockerd-init" -p notice "Bridge device '${device}' already defined in network config"
-	fi
-
 	# Add firewall zone
 	if ! uci_quiet get firewall.${zone}; then
 		logger -t "dockerd-init" -p notice "Adding firewall zone '${zone}' to firewall config"
 		uci_quiet add firewall zone
 		uci_quiet rename firewall.@zone[-1]="${zone}"
+		uci_quiet set firewall.@zone[-1].name="${zone}"
 		uci_quiet set firewall.@zone[-1].input="ACCEPT"
 		uci_quiet set firewall.@zone[-1].output="ACCEPT"
 		uci_quiet set firewall.@zone[-1].forward="ACCEPT"
-		uci_quiet set firewall.@zone[-1].name="${zone}"
 		uci_quiet set firewall.dockerd=forwarding
 		uci_quiet set firewall.@forwarding[-1].src="${zone}"
 		uci_quiet set firewall.@forwarding[-1].dest='wan'
 		uci_quiet commit firewall
 	fi

-	# Add interface to firewall zone
+	# Add device to firewall zone
 	if uci_quiet get firewall.${zone}; then
-		uci_quiet del_list firewall.${zone}.network="${iface}"
-		uci_quiet add_list firewall.${zone}.network="${iface}"
+		uci_quiet del_list firewall.${zone}.device="${device}"
+		if [ docker0 = "$device" ]; then
+			uci_quiet del_list firewall.${zone}.subnet="172.16.0.0/12"
+			uci_quiet add_list firewall.${zone}.subnet="172.16.0.0/12"
+		else
+			uci_quiet add_list firewall.${zone}.device="${device}"
+		fi
 		uci_quiet commit firewall
 	fi

-	reload_config
+	# Add forwarding rules
+	local forwarding_section
+	check_forwarding() {
+		local cfg="${1}"
+		local srcm="${2}"
+		local destm="${3}"
+
+		local src dest
+		config_get src "${cfg}" src
+		config_get dest "${cfg}" dest
+
+		[[ "${src}" = "${srcm}" && "${dest}" = "${destm}" ]] \
+			&& forwarding_section="${cfg}"
+	}
+
+	config_load firewall
+	forwarding_section=""
+	config_foreach check_forwarding forwarding ${zone} wan
+	[[ -n "${forwarding_section}" ]] || {
+		uci_quiet set firewall.${zone}_to_wan=forwarding
+		uci_quiet set firewall.${zone}_to_wan.src=${zone}
+		uci_quiet set firewall.${zone}_to_wan.dest=wan
+	}
+
+	forwarding_section=""
+	config_foreach check_forwarding forwarding ${zone} lan
+	[[ -n "${forwarding_section}" ]] || {
+		uci_quiet set firewall.${zone}_to_lan=forwarding
+		uci_quiet set firewall.${zone}_to_lan.src=${zone}
+		uci_quiet set firewall.${zone}_to_lan.dest=lan
+	}
+
+	forwarding_section=""
+	config_foreach check_forwarding forwarding lan ${zone}
+	[[ -n "${forwarding_section}" ]] || {
+		uci_quiet set firewall.lan_to_${zone}=forwarding
+		uci_quiet set firewall.lan_to_${zone}.src=lan
+		uci_quiet set firewall.lan_to_${zone}.dest=${zone}
+	}
+	uci_quiet commit firewall
+
+	/etc/init.d/firewall reload
 }

 ucidel() {
@ -112,44 +103,28 @@ ucidel() {
 	local device="${2}"
 	local zone="${3}"

-	[ -z "${iface}" ] && {
-		iface="docker"
+	[ -z "${device}" ] && {
 		device="docker0"
 		zone="docker"
 	}

-	/etc/init.d/dockerd running && {
-		echo "Please stop dockerd service first"
-		exit 0
-	}
-
-	# Remove network device
-	if uci_quiet delete network.$(find_network_device "${device}"); then
-		logger -t "dockerd-init" -p notice "Deleting bridge device '${device}' from network config"
-		uci_quiet commit network
-	fi
-
-	# Remove network interface
-	if uci_quiet get network.${iface}; then
-		logger -t "dockerd-init" -p notice "Deleting interface '${iface}' from network config"
-		uci_quiet delete network.${iface}
-		uci_quiet commit network
-	fi
-
 	# Remove interface from firewall zone
 	if uci_quiet get firewall.${zone}; then
-		logger -t "dockerd-init" -p notice "Deleting network interface '${iface}' in zone '${zone}' from firewall config"
-		uci_quiet del_list firewall.${zone}.network="${iface}"
+		logger -t "dockerd-init" -p notice "Deleting network device '${device}' in zone '${zone}' from firewall config"
+		uci_quiet del_list firewall.${zone}.device="${device}"
 		uci_quiet commit firewall
 		# Remove Firewall zone if network is empty
-		if ! uci_quiet get firewall.${zone}.network; then
+		if ! uci_quiet get firewall.${zone}.device; then
 			logger -t "dockerd-init" -p notice "Deleting firewall zone '${zone}' from firewall config"
 			uci_quiet delete firewall.${zone}
+			uci_quiet delete firewall.${zone}_to_wan
+			uci_quiet delete firewall.${zone}_to_lan
+			uci_quiet delete firewall.lan_to_${zone}
 		fi
 		uci_quiet commit firewall
 	fi

-	reload_config
+	/etc/init.d/firewall reload
 }

 process_config() {
@ -174,7 +149,7 @@ process_config() {

 	config_get data_root globals data_root "/opt/docker/"
 	config_get log_level globals log_level "warn"
-	config_get_bool iptables globals iptables "1"
+	config_get_bool iptables globals iptables "0"
 	config_get_bool ip6tables globals ip6tables "0"

 	# Don't add these options by default
@ -193,6 +168,7 @@ process_config() {
 	config_get https_proxy proxies https_proxy "${https_proxy}"
 	config_get no_proxy proxies no_proxy "${no_proxy}"
 	config_get storage_driver globals storage_driver ""
+	config_get max_concurrent_downloads globals max_concurrent_downloads ""

 	. /usr/share/libubox/jshn.sh
 	json_init
@ -223,6 +199,14 @@ process_config() {
 		json_close_object
 	fi
 	[ -z "${storage_driver}" ] || json_add_string "storage-driver" "${storage_driver}"
+
+	[ "${max_concurrent_downloads:-0}" -eq "0" ] || json_add_int "max-concurrent-downloads" "${max_concurrent_downloads}"
+	json_add_string "log-driver" "json-file"
+	json_add_object "log-opts"
+	json_add_string "max-size" "50m"
+	json_add_string "max-file" "2"
+	json_close_object
+
 	json_dump > "${DOCKERD_CONF}"

 	[ "${iptables}" -eq "1" ] && config_foreach iptables_add_blocking_rule firewall
@ -245,6 +229,14 @@ start_service() {
 }

 reload_service() {
+	if [ -f "${DOCKERD_CONF}" -a -f /etc/config/dockerd ]; then
+		local oldroot=`jsonfilter -i "${DOCKERD_CONF}" -e @[\"data-root\"]`
+		local newroot=`uci get dockerd.globals.data_root`
+		if [ "$oldroot" != "$newroot" ]; then
+			restart
+			return 0
+		fi
+	fi
 	process_config
 	procd_send_signal dockerd
 }
--- a/dockerd/files/etc/config/dockerd
+++ b/dockerd/files/etc/config/dockerd
@ -10,7 +10,7 @@ config globals 'globals'
 	option data_root '/opt/docker/'
 #	option log_driver 'local'
 	option log_level 'warn'
-	option iptables '1'
+	option iptables '0'
 #	list hosts 'unix:///var/run/docker.sock'
 #	option bip '172.18.0.1/24'
 #	option fixed_cidr '172.17.0.0/16'
@ -20,6 +20,7 @@ config globals 'globals'
 #	list dns '172.17.0.1'
 #	list registry_mirrors 'https://<my-docker-mirror-host>'
 #	list registry_mirrors 'https://hub.docker.com'
+#	option max_concurrent_downloads '2'

 # If your organization uses a proxy server to connect to the internet, you may need to configure the proxy.
 # See https://docs.docker.com/engine/daemon/proxy/ for more details
--- a/dockerd/files/etc/hotplug.d/net/br-netfilter
+++ b/dockerd/files/etc/hotplug.d/net/br-netfilter
@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$ACTION" = add -a "x$DEVTYPE" = xbridge ]; then
+    if [ "$DEVICENAME" = "docker0" ] || echo "$DEVICENAME" | grep -qE '^br-[0-9a-f]{12}$'; then
+        if [ "$(uci -q get dockerd.globals.iptables)" = "1" ]; then
+            echo "1" >/sys$DEVPATH/bridge/nf_call_iptables
+        fi
+        if [ "$(uci -q get dockerd.globals.ip6tables)" = "1" ]; then
+            echo "1" >/sys$DEVPATH/bridge/nf_call_ip6tables
+        fi
+    fi
+fi
--- a/dockerd/files/etc/sysctl.d/sysctl-br-netfilter-ip.conf
+++ b/dockerd/files/etc/sysctl.d/sysctl-br-netfilter-ip.conf
@ -1,7 +0,0 @@
-# Do not edit, changes to this file will be lost on upgrades
-# /etc/sysctl.conf can be used to customize sysctl settings
-
-# enable bridge firewalling for docker
-# net.bridge.bridge-nf-call-ip6tables=1
-# net.bridge.bridge-nf-call-iptables=1
-
--- a/dockerd/files/etc/uci-defaults/16_docker-netifd-migrate2
+++ b/dockerd/files/etc/uci-defaults/16_docker-netifd-migrate2
@ -0,0 +1,13 @@
+#!/bin/sh
+
+uci -q set dockerd.globals.iptables=0
+
+uci -q delete firewall.docker.network
+
+DOCKER0_DEVICE=`uci show network | grep -E "^network\\.@device\\[\\d+\\]\\.name='docker0'" | head -n1 | head -c -16`
+
+if [ -n "$DOCKER0_DEVICE" ]; then
+    uci delete "$DOCKER0_DEVICE"
+fi
+uci -q delete network.docker
+uci commit
--- a/dockerd/files/etc/uci-defaults/17_docker-fw4
+++ b/dockerd/files/etc/uci-defaults/17_docker-fw4
@ -0,0 +1,5 @@
+#!/bin/sh
+
+/etc/init.d/dockerd uciadd
+
+exit 0
--- a/dockerd/files/lib/fstab.d/dockerd.sh
+++ b/dockerd/files/lib/fstab.d/dockerd.sh
@ -0,0 +1,3 @@
+if /etc/init.d/dockerd enabled && [ -f /etc/config/dockerd ]; then
+    fstab_add_essential_mountpoint "$(uci -q get dockerd.globals.data_root)"
+fi
--- a/dockerd/git-short-commit.sh
+++ b/dockerd/git-short-commit.sh
@ -39,7 +39,7 @@ git init --quiet "${GIT_DIR}"

 		if git fetch --depth 1 origin "${GIT_REF}"; then
 			git checkout --detach FETCH_HEAD --
-			git rev-parse --short=7 HEAD
+			git rev-parse --short HEAD
 			break
 		fi

--- a/luci-app-arcadia/Makefile
+++ b/luci-app-arcadia/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.0-20250610
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for arcadia
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-arcadia/conffiles
 /etc/config/arcadia
--- a/luci-app-chinesesubfinder/Makefile
+++ b/luci-app-chinesesubfinder/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.3-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for ChineseSubFinder
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-chinesesubfinder/conffiles
 /etc/config/chinesesubfinder
--- a/luci-app-codeserver/Makefile
+++ b/luci-app-codeserver/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20251011
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for CodeServer
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-codeserver/conffiles
 /etc/config/codeserver
--- a/luci-app-demon/Makefile
+++ b/luci-app-demon/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.2.0-20250625
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for demon
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-demon/conffiles
 /etc/config/demon
--- a/luci-app-docker/Makefile
+++ b/luci-app-docker/Makefile
@ -7,10 +7,10 @@
 include $(TOPDIR)/rules.mk

 LUCI_TITLE:=Luci for Docker-CE
-LUCI_DEPENDS:=+luci-compat +docker +dockerd +dockerd +e2fsprogs +fdisk
+LUCI_DEPENDS:=+luci-compat +docker +dockerd +e2fsprogs +fdisk
 LUCI_PKGARCH:=all
 PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 include $(TOPDIR)/feeds/luci/luci.mk

--- a/luci-app-dockerman/Makefile
+++ b/luci-app-dockerman/Makefile
@ -7,7 +7,7 @@ LUCI_DEPENDS:=@(aarch64||arm||x86_64) \
 	+luci-base \
 	+luci-compat \
 	+luci-lib-docker \
-	+docker +dockerd \
+	+docker \
 	+ttyd \
 	+dockerd \
 	+docker-compose
@ -17,7 +17,7 @@ PKG_MAINTAINER:=lisaac <lisaac.cn@gmail.com> \
 		Florian Eckert <fe@dev.tdt.de>

 PKG_VERSION:=0.5.13.20250109
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 include $(TOPDIR)/feeds/luci/luci.mk

--- a/luci-app-dpanel/Makefile
+++ b/luci-app-dpanel/Makefile
@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk

 # Updated: 2025-10-09
 PKG_VERSION:=1.0.0-20251009
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for DPanel
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-dpanel/conffiles
 /etc/config/dpanel
--- a/luci-app-drawio/Makefile
+++ b/luci-app-drawio/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.0-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for DrawIO
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker +docker-compose
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker +docker-compose

 define Package/luci-app-drawio/conffiles
 /etc/config/drawio
--- a/luci-app-emby/Makefile
+++ b/luci-app-emby/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.3-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Emby
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-emby/conffiles
 /etc/config/emby
--- a/luci-app-excalidraw/Makefile
+++ b/luci-app-excalidraw/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.0-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Excalidraw
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker +docker-compose
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker +docker-compose

 define Package/luci-app-excalidraw/conffiles
 /etc/config/excalidraw
--- a/luci-app-feishuvpn/Makefile
+++ b/luci-app-feishuvpn/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for FeiShuVpn
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-feishuvpn/conffiles
 /etc/config/feishuvpn
--- a/luci-app-gogs/Makefile
+++ b/luci-app-gogs/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.3-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Gogs
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-gogs/conffiles
 /etc/config/gogs
--- a/luci-app-heimdall/Makefile
+++ b/luci-app-heimdall/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for heimdall
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+docker +luci-lib-taskd

 define Package/luci-app-heimdall/conffiles
 /etc/config/heimdall
--- a/luci-app-homeassistant/Makefile
+++ b/luci-app-homeassistant/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.4-20250321
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for homeassistant
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-homeassistant/conffiles
 /etc/config/homeassistant
--- a/luci-app-htreader/Makefile
+++ b/luci-app-htreader/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for HTReader
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-htreader/conffiles
 /etc/config/htreader
--- a/luci-app-immich/Makefile
+++ b/luci-app-immich/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20250321
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Immich
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker +docker-compose
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker +docker-compose

 define Package/luci-app-immich/conffiles
 /etc/config/immich
--- a/luci-app-istoredup/Makefile
+++ b/luci-app-istoredup/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.7-20241211
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for istoredup
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +vmease
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +vmease

 define Package/luci-app-istoredup/conffiles
 /etc/config/istoredup
--- a/luci-app-istorego/Makefile
+++ b/luci-app-istorego/Makefile
@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 LUCI_TITLE:=LuCI support for istorego 
-LUCI_DEPENDS:=+docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+docker +luci-lib-taskd
 LUCI_PKGARCH:=all

 PKG_VERSION:=0.0.3
 # PKG_RELEASE MUST be empty for luci.mk
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_MINIFY_CSS:=0
 LUCI_MINIFY_JS:=0
--- a/luci-app-istorepanel/Makefile
+++ b/luci-app-istorepanel/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.6-20250406
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for 1Panel
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-istorepanel/conffiles
 /etc/config/istorepanel
--- a/luci-app-ittools/Makefile
+++ b/luci-app-ittools/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.4-20250321
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for ITTools
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-ittools/conffiles
 /etc/config/ittools
--- a/luci-app-jackett/Makefile
+++ b/luci-app-jackett/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.1-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for jackett
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-jackett/conffiles
 /etc/config/jackett
--- a/luci-app-jellyfin/Makefile
+++ b/luci-app-jellyfin/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.2.2-20250321
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for jellyfin
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-jellyfin/conffiles
 /etc/config/jellyfin
--- a/luci-app-lanraragi/Makefile
+++ b/luci-app-lanraragi/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.1-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for LANraragi
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-lanraragi/conffiles
 /etc/config/lanraragi
--- a/luci-app-memos/Makefile
+++ b/luci-app-memos/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Memos
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-memos/conffiles
 /etc/config/memos
--- a/luci-app-mfun/Makefile
+++ b/luci-app-mfun/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=0.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for mfun
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+docker +luci-lib-taskd

 define Package/luci-app-mfun/conffiles
 /etc/config/mfun
--- a/luci-app-mosdns/Makefile
+++ b/luci-app-mosdns/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-mosdns
-PKG_VERSION:=1.6.17
-PKG_RELEASE:=1
+PKG_VERSION:=1.7.0
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI Support for mosdns
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+mosdns +jsonfilter +curl +v2ray-geoip +v2ray-geosite +v2dat
+LUCI_DEPENDS:=+mosdns +curl +v2ray-geoip +v2ray-geosite +v2dat

 PKG_MAINTAINER:=sbwml <admin@cooluc.com>

--- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js
+++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js
@ -70,31 +70,42 @@ async function loadCodeMirrorResources() {
 	await loadScripts();
 }

+var callMosdns = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'get_version',
+	expect: { '': {} }
+});
+
+var callFlushCache = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'flush_cache',
+	expect: { '': {} }
+});
+
 return view.extend({
 	load: function () {
 		return Promise.all([
-			L.resolveDefault(fs.exec('/usr/bin/mosdns', ['version']), null),
+			L.resolveDefault(callMosdns(), null),
 		]);
 	},

-	handleFlushCache: function (m, section_id, ev) {
-		return fs.exec('/usr/share/mosdns/mosdns.sh', ['flush'])
-			.then(function (lazy_cache) {
-				var res = lazy_cache.code;
-				if (res === 0) {
-					ui.addNotification(null, E('p', _('Flushing DNS Cache Success.')), 'info');
-				} else {
-					ui.addNotification(null, E('p', _('Flushing DNS Cache Failed, Please check if MosDNS is running.')), 'error');
-				}
-			});
+	handleFlushCache: function () {
+		return callFlushCache().then(function(res) {
+			if (res.success) {
+				ui.addNotification(null, E('p', _('Flushing DNS Cache Success.')), 'info');
+			} else {
+				ui.addNotification(null, E('p', _('Flushing DNS Cache Failed, Please check if MosDNS is running.') + (res.error ? ': ' + res.error : '')), 'error');
+			}
+		});
 	},

-	render: function (basic) {
+		render: function (data) {
 		var m, s, o, v;
 		v = '';

-		if (basic[0] && basic[0].code === 0) {
-			v = basic[0].stdout.trim();
+		var version = (data[0] && data[0].version) ? data[0].version : null;
+		if (version) {
+			v = version;
 		}
 		m = new form.Map('mosdns', _('MosDNS') + '&#160;' + v,
 			_('MosDNS is a plugin-based DNS forwarder/traffic splitter.'));
@ -147,6 +158,7 @@ return view.extend({
 		o.depends('configfile', '/var/etc/mosdns.json');

 		o = s.taboption('basic', form.Value, 'listen_address', _('Listen Address'));
+		o.default = '0.0.0.0';
 		o.depends('configfile', '/var/etc/mosdns.json');

 		o = s.taboption('basic', form.ListValue, 'log_level', _('Log Level'));
@ -389,7 +401,7 @@ return view.extend({
 		/* api */
 		o = s.taboption('api', form.Value, 'listen_port_api', _('API Listen port'));
 		o.datatype = 'and(port,min(1))';
-		o.default = 9091;
+		o.default = 52001;
 		o.depends('configfile', '/var/etc/mosdns.json');

 		o = s.taboption('api', form.Button, '_flush_cache', null,
@ -397,7 +409,7 @@ return view.extend({
 		o.title = '&#160;';
 		o.inputtitle = _('Flush DNS Cache');
 		o.inputstyle = 'apply';
-		o.onclick = L.bind(this.handleFlushCache, this, m);
+		o.onclick = L.bind(this.handleFlushCache, this);
 		o.depends('cache', '1');

 		/* configuration */
--- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js
+++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/logs.js
@ -3,18 +3,28 @@
 'require fs';
 'require poll';
 'require view';
+'require rpc';
+'require ui';
+
+var callPrintLog = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'print_log',
+	expect: { '': {} }
+});
+
+var callCleanLog = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'clean_log',
+	expect: { '': {} }
+});

 var scrollPosition = 0;
 var userScrolled = false;
 var logTextarea;

 function pollLog() {
-	return Promise.all([
-		fs.exec_direct('/usr/share/mosdns/mosdns.sh', ['printlog']).then(function (res) {
-			return res.trim().split(/\n/).join('\n');
-		}),
-	]).then(function (data) {
-		logTextarea.value = data[0] || _('No log data.');
+	return callPrintLog().then(function (res) {
+		logTextarea.value = res.log || _('No log data.');

 		if (!userScrolled) {
 			logTextarea.scrollTop = logTextarea.scrollHeight;
@ -26,8 +36,13 @@ function pollLog() {

 return view.extend({
 	handleCleanLogs: function () {
-		return fs.exec('/usr/share/mosdns/mosdns.sh', ['cleanlog'])
-			.catch(function (e) { ui.addNotification(null, E('p', e.message)) });
+		return callCleanLog().then(function(res) {
+			if (res.success) {
+				logTextarea.value = ''; // Clear textarea on success
+			} else {
+				ui.addNotification(null, E('p', _('Failed to clean logs.') + (res.error ? ': ' + res.error : '')), 'error');
+			}
+		}).catch(function (e) { ui.addNotification(null, E('p', e.message)) });
 	},

 	render: function () {
--- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js
+++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/rules.js
@ -3,6 +3,12 @@
 'require fs';
 'require ui';
 'require view';
+'require rpc';
+
+var callRestart = rpc.declare({
+	object: 'luci.mosdns',
+	method: 'restart'
+});

 return view.extend({
 	render: function () {
@ -24,6 +30,7 @@ return view.extend({
 		s.tab('localptrlist', _('Block PTR'));
 		s.tab('streamingmedialist', _('Streaming Media'));

+		// --- White Lists ---
 		o = s.taboption('whitelist', form.TextValue, '_whitelist',
 			null,
 			'<font color=\'red\'>'
@ -41,13 +48,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/whitelist.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/whitelist.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/whitelist.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- Block Lists ---
 		o = s.taboption('blocklist', form.TextValue, '_blocklist',
 			null,
 			'<font color=\'red\'>'
@ -65,13 +78,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/blocklist.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/blocklist.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/blocklist.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- Grey Lists ---
 		o = s.taboption('greylist', form.TextValue, '_greylist',
 			null,
 			'<font color=\'red\'>'
@ -89,13 +108,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/greylist.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/greylist.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/greylist.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- DDNS Lists ---
 		o = s.taboption('ddnslist', form.TextValue, '_ddnslist',
 			null,
 			'<font color=\'red\'>'
@ -113,13 +138,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/ddnslist.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/ddnslist.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/ddnslist.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- Hosts ---
 		o = s.taboption('hostslist', form.TextValue, '_hostslist',
 			null,
 			'<font color=\'red\'>'
@ -137,13 +168,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/hosts.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/hosts.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/hosts.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- Redirect ---
 		o = s.taboption('redirectlist', form.TextValue, '_redirectlist',
 			null,
 			'<font color=\'red\'>'
@ -161,13 +198,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/redirect.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/redirect.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/redirect.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- Block PTR ---
 		o = s.taboption('localptrlist', form.TextValue, '_localptrlist',
 			null,
 			'<font color=\'red\'>'
@ -185,13 +228,19 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/local-ptr.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/local-ptr.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/local-ptr.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

+		// --- Streaming Media ---
 		o = s.taboption('streamingmedialist', form.TextValue, '_streamingmedialist',
 			null,
 			'<font color=\'red\'>'
@ -209,12 +258,17 @@ return view.extend({
 				if (value == formvalue) {
 					return;
 				}
-				return fs.write('/etc/mosdns/rule/streaming.txt', formvalue.trim().replace(/\r\n/g, '\n') + '\n')
+				return fs.write('/etc/mosdns/rule/streaming.txt', (formvalue.trim() ? formvalue.trim().replace(/\r\n/g, '\n') + '\n' : ''))
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
 					});
 			});
 		};
+		o.remove = function (section_id) {
+			return fs.write('/etc/mosdns/rule/streaming.txt', '').catch(function (e) {
+				ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
+			});
+		};

 		return m.render();
 	},
@ -222,9 +276,13 @@ return view.extend({
 	handleSaveApply: function (ev) {
 		var m = this.map;
 		onclick = L.bind(this.handleSave, this, m);
-		return fs.exec('/etc/init.d/mosdns', ['restart'])
-			.then(function () {
-				window.location.reload();
+		return callRestart()
+			.then(function (res) {
+				if (res && res.code === 0) {
+					window.location.reload();
+				} else {
+					ui.addNotification(null, E('p', _('Failed to restart mosdns: %s').format(res.output || 'Unknown error')));
+				}
 			})
 			.catch(function (e) {
 				ui.addNotification(null, E('p', _('Failed to restart mosdns: %s').format(e.message)));
--- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js
+++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/update.js
@ -5,16 +5,22 @@
 'require view';

 return view.extend({
-	handleUpdate: function (m, section_id, ev) {
-		return fs.exec('/usr/share/mosdns/mosdns.sh', ['geodata'])
-			.then(function (i) {
-				var res = i.code;
-				if (res === 0) {
+	handleUpdate: function () {
+		ui.showModal(_('Updating...'), [
+			E('p', { 'class': 'spinning' }, _('Please wait, this may take a few moments...')),
+		]);
+		return fs.exec('/usr/share/mosdns/mosdns.uc', ['update'])
+			.then(function (res) {
+				ui.hideModal();
+				if (res.code === 0) {
 					ui.addNotification(null, E('p', _('Update success')), 'info');
 				} else {
-					ui.addNotification(null, E('p', i.stderr + '<br />' + i.stdout), 'warn');
+					ui.addNotification(null, E('p', res.stderr + '<br />' + res.stdout), 'warn');
 					ui.addNotification(null, E('p', _('Update failed, Please check the network status')), 'error');
 				}
+			}).catch(function (e) {
+				ui.hideModal();
+				ui.addNotification(null, E('p', _('Update failed: %s').format(e.message)), 'error');
 			});
 	},

@ -68,7 +74,7 @@ return view.extend({
 		o.title = _('Database Update');
 		o.inputtitle = _('Check And Update');
 		o.inputstyle = 'apply';
-		o.onclick = L.bind(this.handleUpdate, this, m);
+		o.onclick = L.bind(this.handleUpdate, this);

 		return m.render();
 	}
--- a/luci-app-mosdns/po/templates/mosdns.pot
+++ b/luci-app-mosdns/po/templates/mosdns.pot
@ -0,0 +1,794 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-03-20 09:23+0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:31
+#: htdocs/luci-static/resources/view/mosdns/basic.js:33
+#: htdocs/luci-static/resources/view/mosdns/basic.js:110
+#: htdocs/luci-static/resources/view/mosdns/logs.js:70
+msgid "MosDNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:31
+msgid "RUNNING"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:33
+msgid "NOT RUNNING"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:95
+msgid "Flushing DNS Cache Success."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:97
+msgid "Flushing DNS Cache Failed, Please check if MosDNS is running."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:111
+msgid "MosDNS is a plugin-based DNS forwarder/traffic splitter."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:133
+msgid "Collecting data..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:139
+msgid "Basic Options"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:140
+msgid "Advanced Options"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:141
+msgid "Cloudflare Options"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:142
+msgid "API Options"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:143
+msgid "GeoData Export"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:146
+#: htdocs/luci-static/resources/view/mosdns/basic.js:370
+msgid "Enabled"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:150
+msgid "Config File"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:151
+msgid "Default Config"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:152
+msgid "Custom Config"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:155
+msgid "Listen Port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:160
+msgid "Listen Address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:164
+msgid "Log Level"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:165
+msgid "Debug"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:166
+msgid "Info"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:167
+msgid "Warning"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:168
+msgid "Error"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:172
+msgid "Log File"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:177
+msgid "DNS Forward"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:177
+msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:181
+msgid "DNS redirect"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:181
+msgid "Force redirect all local DNS queries to MosDNS, a.k.a. DNS Hijacking"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:186
+msgid "China DNS prefer IPv4"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:187
+msgid ""
+"IPv4 is preferred for China DNS resolution of dual-stack addresses, and is "
+"not affected when the destination is IPv6 only"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:191
+msgid "Remote DNS prefer IPv4"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:192
+msgid ""
+"IPv4 is preferred for Remote / Streaming Media DNS resolution of dual-stack "
+"addresses, and is not affected when the destination is IPv6 only"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:196
+msgid "Custom China DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:196
+msgid "Follow WAN interface DNS if not enabled"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:200
+msgid "Apple domains optimization"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:201
+msgid ""
+"For Apple domains equipped with Chinese mainland CDN, always responsive to "
+"Chinese CDN IP addresses"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:205
+msgid "China DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:206
+#: htdocs/luci-static/resources/view/mosdns/basic.js:254
+msgid "Tencent Public DNS (119.29.29.29)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:207
+#: htdocs/luci-static/resources/view/mosdns/basic.js:255
+msgid "Tencent Public DNS (119.28.28.28)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:208
+#: htdocs/luci-static/resources/view/mosdns/basic.js:256
+msgid "Aliyun Public DNS (223.5.5.5)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:209
+#: htdocs/luci-static/resources/view/mosdns/basic.js:257
+msgid "Aliyun Public DNS (223.6.6.6)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:210
+msgid "TrafficRoute Public DNS (180.184.1.1)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:211
+msgid "TrafficRoute Public DNS (180.184.2.2)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:212
+#: htdocs/luci-static/resources/view/mosdns/basic.js:258
+msgid "Xinfeng Public DNS (114.114.114.114)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:213
+#: htdocs/luci-static/resources/view/mosdns/basic.js:259
+msgid "Xinfeng Public DNS (114.114.115.115)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:214
+#: htdocs/luci-static/resources/view/mosdns/basic.js:260
+msgid "Baidu Public DNS (180.76.76.76)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:215
+msgid "Tencent Public DNS (DNS over HTTPS)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:216
+msgid "Aliyun Public DNS (DNS over QUIC)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:217
+msgid "Aliyun Public DNS (DNS over HTTPS)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:218
+msgid "Aliyun Public DNS (DNS over HTTP/3)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:219
+msgid "360 Public DNS (DNS over HTTPS)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:223
+msgid "Remote DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:224
+#: htdocs/luci-static/resources/view/mosdns/basic.js:241
+#: htdocs/luci-static/resources/view/mosdns/basic.js:262
+msgid "CloudFlare Public DNS (1.1.1.1)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:225
+#: htdocs/luci-static/resources/view/mosdns/basic.js:242
+msgid "CloudFlare Public DNS (1.0.0.1)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:226
+#: htdocs/luci-static/resources/view/mosdns/basic.js:243
+#: htdocs/luci-static/resources/view/mosdns/basic.js:261
+msgid "Google Public DNS (8.8.8.8)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:227
+#: htdocs/luci-static/resources/view/mosdns/basic.js:244
+msgid "Google Public DNS (8.8.4.4)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:228
+#: htdocs/luci-static/resources/view/mosdns/basic.js:245
+msgid "Quad9 Public DNS (9.9.9.9)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:229
+#: htdocs/luci-static/resources/view/mosdns/basic.js:246
+msgid "Quad9 Public DNS (149.112.112.112)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:230
+#: htdocs/luci-static/resources/view/mosdns/basic.js:247
+msgid "Cisco Public DNS (208.67.222.222)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:231
+#: htdocs/luci-static/resources/view/mosdns/basic.js:248
+msgid "Cisco Public DNS (208.67.220.220)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:235
+msgid "Custom Stream Media DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:236
+msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:240
+msgid "Streaming Media DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:252
+msgid "Bootstrap DNS servers"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:253
+msgid ""
+"Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT "
+"resolvers you specify as upstreams"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:267
+msgid "Concurrent"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:268
+msgid ""
+"DNS query request concurrency, The number of upstream DNS servers that are "
+"allowed to initiate requests at the same time"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:273
+msgid "Idle Timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:274
+msgid "DoH/TCP/DoT Connection Multiplexing idle timeout (default 30 seconds)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:279
+msgid "TCP/DoT Connection Multiplexing"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:280
+msgid ""
+"Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:285
+msgid "Disable TLS Certificate"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:286
+msgid ""
+"Disable TLS Servers certificate validation, Can be useful if system CA "
+"certificate expires or the system time is out of order"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:292
+msgid "Enable EDNS client subnet"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:297
+msgid "IP Address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:298
+msgid ""
+"Please provide the IP address you use when accessing foreign websites. This "
+"IP subnet (0/24) will be used as the ECS address for Remote / Streaming "
+"Media DNS requests"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:299
+msgid ""
+"This feature is typically used when using a self-built DNS server as an "
+"Remote / Streaming Media DNS upstream (requires support from the upstream "
+"server)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:303
+msgid "Prevent DNS Leaks"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:304
+msgid "Enable this option fallback policy forces forwarding to remote DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:309
+msgid "Enable DNS Cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:314
+msgid "DNS Cache Size"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:319
+msgid "Lazy Cache TTL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:320
+msgid ""
+"Lazy cache survival time (in second). To disable Lazy Cache, please set to 0."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:325
+msgid "Cache Dump"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:326
+msgid "Save the cache locally and reload the cache dump on the next startup"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:332
+msgid "Auto Save Cache Interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:337
+msgid "Minimum TTL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:338
+msgid ""
+"Modify the Minimum TTL value (seconds) for DNS answer results, 0 indicating "
+"no modification"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:343
+msgid "Maximum TTL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:344
+msgid ""
+"Modify the Maximum TTL value (seconds) for DNS answer results, 0 indicating "
+"no modification"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:349
+msgid "Disable RR Type 65 (HTTPS/SVCB)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:350
+msgid ""
+"Block DNS RR Type 65 records (HTTPS/SVCB, used for HTTP/3, ECH, etc.), force "
+"using only A/AAAA records."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:354
+msgid "Enable DNS ADblock"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:358
+msgid "ADblock Source"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:359
+msgid ""
+"When using custom rule sources, please use rule types supported by MosDNS "
+"(domain lists)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:361
+msgid "Support for local files, such as: file:///var/mosdns/example.txt"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:371
+msgid ""
+"Match the parsing result with the Cloudflare IP ranges, and when there is a "
+"successful match, \t\t\t\tuse the 'Custom IP' as the parsing result "
+"(experimental feature)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:377
+msgid "Custom IP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:382
+msgid "Cloudflare IP Ranges"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:383
+msgid ""
+"IPv4 CIDR: <a href=\"https://www.cloudflare.com/ips-v4\" target=\"_blank"
+"\">https://www.cloudflare.com/ips-v4</a> <br /> IPv6 CIDR: <a href=\"https://"
+"www.cloudflare.com/ips-v6\" target=\"_blank\">https://www.cloudflare.com/ips-"
+"v6</a>"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:402
+msgid "API Listen port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:408
+msgid ""
+"Flushing DNS Cache will clear any IP addresses or DNS records from MosDNS "
+"cache."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:410
+msgid "Flush DNS Cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:433
+msgid "Configuration Editor"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:434
+msgid ""
+"This is the content of the file '/etc/mosdns/config_custom.yaml' from which "
+"your MosDNS configuration will be generated. \t\t\tOnly accepts "
+"configuration content in yaml format."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:455
+#: htdocs/luci-static/resources/view/mosdns/rules.js:53
+#: htdocs/luci-static/resources/view/mosdns/rules.js:59
+#: htdocs/luci-static/resources/view/mosdns/rules.js:83
+#: htdocs/luci-static/resources/view/mosdns/rules.js:89
+#: htdocs/luci-static/resources/view/mosdns/rules.js:113
+#: htdocs/luci-static/resources/view/mosdns/rules.js:119
+#: htdocs/luci-static/resources/view/mosdns/rules.js:143
+#: htdocs/luci-static/resources/view/mosdns/rules.js:149
+#: htdocs/luci-static/resources/view/mosdns/rules.js:173
+#: htdocs/luci-static/resources/view/mosdns/rules.js:179
+#: htdocs/luci-static/resources/view/mosdns/rules.js:203
+#: htdocs/luci-static/resources/view/mosdns/rules.js:209
+#: htdocs/luci-static/resources/view/mosdns/rules.js:233
+#: htdocs/luci-static/resources/view/mosdns/rules.js:239
+#: htdocs/luci-static/resources/view/mosdns/rules.js:263
+#: htdocs/luci-static/resources/view/mosdns/rules.js:269
+#, javascript-format
+msgid "Unable to save contents: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:460
+msgid "GeoSite Tags"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:461
+msgid "Enter the GeoSite.dat category to be exported, Allow add multiple tags"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:462
+#: htdocs/luci-static/resources/view/mosdns/basic.js:467
+msgid "Export directory: /var/mosdns"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:465
+msgid "GeoIP Tags"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/basic.js:466
+msgid "Enter the GeoIP.dat category to be exported, Allow add multiple tags"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/logs.js:27
+msgid "No log data."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/logs.js:43
+msgid "Failed to clean logs."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/logs.js:65
+msgid "Clear logs"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/logs.js:70
+msgid "Log Data"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/logs.js:75
+#, javascript-format
+msgid "Refresh every %s seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:17
+msgid "Rule Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:18
+msgid "The list of rules only apply to 'Default Config' profiles."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:24
+msgid "White Lists"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:25
+msgid "Block Lists"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:26
+msgid "Grey Lists"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:27
+msgid "DDNS Lists"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:28
+msgid "Hosts"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:29
+msgid "Redirect"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:30
+msgid "Block PTR"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:31
+msgid "Streaming Media"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:37
+msgid ""
+"Added domain names always permit resolution using 'local DNS' with the "
+"highest priority (one domain per line, supports domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:67
+msgid ""
+"Added domain names will block DNS resolution (one domain per line, supports "
+"domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:97
+msgid ""
+"Added domain names will always use 'Remote DNS' for resolution (one domain "
+"per line, supports domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:127
+msgid ""
+"Added domain names will always use 'Local DNS' for resolution, with a forced "
+"TTL of 5 seconds, and results will not be cached (one domain per line, "
+"supports domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:157
+msgid ""
+"Custom Hosts rewrite, for example: baidu.com 10.0.0.1 (one rule per line, "
+"supports domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:187
+msgid ""
+"Redirecting requests for domain names. Request domain A, but return records "
+"for domain B, for example: baidu.com qq.com (one rule per line)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:217
+msgid ""
+"Added domain names will block PTR requests (one domain per line, supports "
+"domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:247
+msgid ""
+"When enabling 'Custom Stream Media DNS', added domains will always use the "
+"'Streaming Media DNS server' for resolution (one domain per line, supports "
+"domain matching rules)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/rules.js:284
+#: htdocs/luci-static/resources/view/mosdns/rules.js:288
+#, javascript-format
+msgid "Failed to restart mosdns: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:9
+msgid "Updating..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:10
+msgid "Please wait, this may take a few moments..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:16
+msgid "Update success"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:19
+msgid "Update failed, Please check the network status"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:23
+#, javascript-format
+msgid "Update failed: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:30
+msgid "Update GeoIP & GeoSite databases"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:31
+msgid ""
+"Automatically update GeoIP and GeoSite databases as well as ad filtering "
+"rules through scheduled tasks."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:36
+msgid "Enable Auto Database Update"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:39
+msgid "Update Cycle"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:40
+msgid "Every Day"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:41
+msgid "Every Monday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:42
+msgid "Every Tuesday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:43
+msgid "Every Wednesday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:44
+msgid "Every Thursday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:45
+msgid "Every Friday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:46
+msgid "Every Saturday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:47
+msgid "Every Sunday"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:50
+msgid "Update Time"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:56
+msgid "GeoIP Type"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:57
+msgid "Little: only include Mainland China and Private IP addresses."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:59
+msgid "Full: includes all Countries and Private IP addresses."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:61
+msgid "Full"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:62
+msgid "Little"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:66
+msgid "GitHub Proxy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:67
+msgid ""
+"Update data files with GitHub Proxy, leave blank to disable proxy downloads."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:68
+msgid "https://gh-proxy.com"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:73
+msgid "Check And Update GeoData."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:74
+msgid "Database Update"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/mosdns/update.js:75
+msgid "Check And Update"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-mosdns.json:14
+msgid "Basic Setting"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-mosdns.json:22
+msgid "Rules"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-mosdns.json:30
+msgid "Geodata Update"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-mosdns.json:38
+msgid "Logs"
+msgstr ""
--- a/luci-app-mosdns/po/zh_Hans/mosdns.po
+++ b/luci-app-mosdns/po/zh_Hans/mosdns.po
--- a/luci-app-mosdns/root/etc/init.d/mosdns
+++ b/luci-app-mosdns/root/etc/init.d/mosdns
@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2020-2022, IrineSistiana
-# Copyright (C) 2023-2024, sbwml <admin@cooluc.com>
+# Copyright (C) 2023-2026, sbwml <admin@cooluc.com>

 START=75
 USE_PROCD=1
@ -10,7 +10,7 @@ CONF=$(uci -q get mosdns.config.configfile)
 CRON_FILE=/etc/crontabs/root
 DUMP_FILE=/etc/mosdns/cache.dump
 DUMP_FILE_DEFAULT=/usr/share/mosdns/cache.dump
-MOSDNS_SCRIPT=/usr/share/mosdns/mosdns.sh
+MOSDNS_SCRIPT=/usr/share/mosdns/mosdns.uc

 get_config() {
 	config_get enabled $1 enabled 0
@ -41,7 +41,7 @@ get_config() {
 	config_get custom_stream_media_dns $1 custom_stream_media_dns 0
 	config_get stream_media_dns $1 stream_media_dns "tls://8.8.8.8"
 	config_get bootstrap_dns $1 bootstrap_dns "119.29.29.29"
-	config_get listen_port_api $1 listen_port_api 9091
+	config_get listen_port_api $1 listen_port_api 52001
 	config_get concurrent $1 concurrent 1
 	config_get insecure_skip_verify $1 insecure_skip_verify 0
 	config_get idle_timeout $1 idle_timeout 30
@ -178,7 +178,8 @@ generate_config() {
 	json_add_string "type" "domain_set"
 	json_add_object "args"
 	json_add_array "files"
-	adlist=$($MOSDNS_SCRIPT adlist)
+	adlist=$($MOSDNS_SCRIPT get_adlist)
+	[ -z "$adlist" ] && adlist="/var/mosdns/disable-ads.txt" # fail-safe
 	for list in $adlist; do
 		json_add_string "" "$list"
 	done
@ -256,7 +257,8 @@ generate_config() {
 	json_add_object "args"
 	json_add_int "concurrent" "$concurrent"
 	json_add_array "upstreams"
-	local_dns=$($MOSDNS_SCRIPT dns)
+	local_dns=$($MOSDNS_SCRIPT interface_dns)
+	[ -z "$local_dns" ] && local_dns="119.29.29.29 223.5.5.5" # fail-safe
 	for addr in $local_dns; do
 		enable_http3=0
 		if echo "$addr" | grep -q "^h3://"; then
@ -730,31 +732,26 @@ reload_service() {
 }

 setcron() {
-	sed -i '/mosdns.sh/d' $CRON_FILE 2>/dev/null
-	[ "$geo_auto_update" -eq 1 ] && echo "0 $geo_update_day_time * * $geo_update_week_time $MOSDNS_SCRIPT geodata" >> $CRON_FILE
+	sed -i '/mosdns.uc/d' $CRON_FILE 2>/dev/null
+	[ "$geo_auto_update" -eq 1 ] && echo "0 $geo_update_day_time * * $geo_update_week_time /usr/share/mosdns/mosdns.uc update" >> $CRON_FILE
 	crontab $CRON_FILE
 }

 delcron() {
-	sed -i '/mosdns.sh/d' $CRON_FILE 2>/dev/null
+	sed -i '/mosdns.uc/d' $CRON_FILE 2>/dev/null
 	crontab $CRON_FILE
 }

-v2dat_dump() {
-	$MOSDNS_SCRIPT v2dat_dump
-}
-
 start_service() {
 	config_load "mosdns"
 	config_foreach get_config "mosdns"
 	[ $enabled -ne 1 ] && return 1
 	delcron ; setcron
-	:> $($MOSDNS_SCRIPT logfile)
-	if [ "${log_level}" = "error" ] || [ "${log_level}" = "warn" ]; then
-		v2dat_dump > /dev/null 2>&1
-	else
-		v2dat_dump >> $($MOSDNS_SCRIPT logfile) 2>&1
-	fi
+
+	rm -rf /tmp/log/mosdns*
+
+	$MOSDNS_SCRIPT v2dat_dump
+
 	[ "${CONF}" = "/var/etc/mosdns.json" ] && generate_config

 	procd_open_instance mosdns
@ -766,9 +763,11 @@ start_service() {
 	procd_set_param stderr 1
 	procd_set_param respawn
 	procd_close_instance mosdns
+
 	[ "$redirect" -ne 1 ] && [ -f "/etc/mosdns/redirect.lock" ] && restore_setting
 	[ "$redirect" -eq 1 ] && redirect_setting
 	reload_dnsmasq
+
 	# dns hijack
 	if [ "$local_dns_redirect" -eq 1 ] && [ -f "/sbin/fw4" ]; then
 		! nft --check list table inet mosdns > "/dev/null" 2>&1 || \
@ -777,13 +776,13 @@ start_service() {
 		nft add chain inet mosdns prerouting "{ type nat hook prerouting priority -95; policy accept; }"
 		nft add rule inet mosdns prerouting "meta nfproto { ipv4, ipv6 } udp dport 53 counter redirect to :$listen_port comment \"DNS HIJACK\""
 	fi
+
 	# Update Adlist
 	update_list=0
 	if [ "$adblock" -eq 1 ]; then
 		if [ -f "/etc/mosdns/rule/.ad_source" ]; then
-			for url in $ad_source;
-			do
-				if [ "$url" = "geosite.dat" ] || [ $(echo "$url" | grep -c -E "^file://") -eq 1 ]; then
+			for url in $ad_source; do
+				if [ "$url" = "geosite.dat" ] ||[ $(echo "$url" | grep -c -E "^file://") -eq 1 ]; then
 					continue
 				fi
 				if [ $(grep -c "$url" "/etc/mosdns/rule/.ad_source") -eq 0 ]; then
@ -795,7 +794,11 @@ start_service() {
 			update_list=1
 		fi
 	fi
-	[ "$update_list" -eq 1 ] && $MOSDNS_SCRIPT adlist_update &> /dev/null &
+
+	[ "$update_list" -eq 1 ] && {
+		sleep 3
+		$MOSDNS_SCRIPT update_adlist
+	} &
 }

 stop_service() {
--- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
+++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
@ -1,210 +0,0 @@
-#!/bin/sh
-
-script_action=${1}
-
-logfile_path() {
-    configfile=$(uci -q get mosdns.config.configfile)
-    if [ "$configfile" = "/var/etc/mosdns.json" ]; then
-        uci -q get mosdns.config.log_file
-    else
-        [ ! -f /etc/mosdns/config_custom.yaml ] && exit 1
-        awk '/^log:/{f=1;next}f==1{if($0~/file:/){print;exit}if($0~/^[^ ]/)exit}' /etc/mosdns/config_custom.yaml | grep -Eo "/[^'\"]+"
-    fi
-}
-
-print_logfile() {
-    cat $(logfile_path);
-}
-
-clean_logfile() {
-    true > $(logfile_path);
-}
-
-interface_dns() (
-    if [ "$(uci -q get mosdns.config.custom_local_dns)" = 1 ]; then
-        uci -q get mosdns.config.local_dns
-    else
-        peerdns=$(uci -q get network.wan.peerdns)
-        proto=$(uci -q get network.wan.proto)
-        if [ "$peerdns" = 0 ] || [ "$proto" = "static" ]; then
-            uci -q get network.wan.dns
-        else
-            interface_status=$(ubus call network.interface.wan status)
-            echo $interface_status | jsonfilter -e "@['dns-server'][0]"
-            echo $interface_status | jsonfilter -e "@['dns-server'][1]"
-        fi
-        [ $? -ne 0 ] && echo "119.29.29.29 223.5.5.5"
-    fi
-)
-
-get_adlist() (
-    adblock=$(uci -q get mosdns.config.adblock)
-    if [ "$adblock" = 1 ]; then
-        mkdir -p /etc/mosdns/rule/adlist
-        ad_source=$(uci -q get mosdns.config.ad_source)
-        for url in $ad_source;
-        do
-            if [ $(echo $url) = 'geosite.dat' ]; then
-                echo "/var/mosdns/geosite_category-ads-all.txt"
-            elif echo "$url" | grep -Eq "^file://" ; then
-                echo "$url" | sed 's/file:\/\///'
-            else
-                echo "/etc/mosdns/rule/adlist/$(basename $url)"
-                [ ! -f "/etc/mosdns/rule/adlist/$(basename $url)" ] && touch /etc/mosdns/rule/adlist/$(basename $url)
-            fi
-        done
-    else
-        rm -rf /etc/mosdns/rule/adlist /etc/mosdns/rule/.ad_source
-        touch /var/mosdns/disable-ads.txt
-        echo "/var/mosdns/disable-ads.txt"
-    fi
-)
-
-adlist_update() {
-    [ "$(uci -q get mosdns.config.adblock)" != 1 ] && return 0
-    lock_file=/var/lock/mosdns_ad_update.lock
-    ad_source=$(uci -q get mosdns.config.ad_source)
-    : > /etc/mosdns/rule/.ad_source
-    if [ -f "$lock_file" ]; then
-        has_update=0
-        exit 0
-    else
-        : > $lock_file
-    fi
-    AD_TMPDIR=$(mktemp -d) || exit 1
-    has_update=0
-    for url in $ad_source;
-    do
-        if [ "$url" != "geosite.dat" ] && [ $(echo "$url" | grep -c -E "^file://") -eq 0 ]; then
-            has_update=1
-            echo "$url" >> /etc/mosdns/rule/.ad_source
-            filename=$(basename $url)
-            if echo "$url" | grep -Eq "^https://raw.githubusercontent.com" ; then
-                [ -n "$(uci -q get mosdns.config.github_proxy)" ] && mirror="$(uci -q get mosdns.config.github_proxy)/"
-            else
-                mirror=""
-            fi
-            echo -e "Downloading $mirror$url"
-            curl --connect-timeout 5 -m 90 --ipv4 -kfSLo "$AD_TMPDIR/$filename" "$mirror$url"
-        fi
-    done
-    if [ $? -ne 0 ]; then
-        echo -e "\e[1;31mRules download failed."
-        rm -rf "$AD_TMPDIR" "$lock_file"
-        exit 1
-    else
-        [ $has_update -eq 1 ] && {
-            mkdir -p /etc/mosdns/rule/adlist
-            rm -rf /etc/mosdns/rule/adlist/*
-            \cp $AD_TMPDIR/* /etc/mosdns/rule/adlist
-        }
-    fi
-    rm -rf "$AD_TMPDIR" "$lock_file"
-}
-
-geodat_update() (
-    TMPDIR=$(mktemp -d) || exit 1
-    [ -n "$(uci -q get mosdns.config.github_proxy)" ] && mirror="$(uci -q get mosdns.config.github_proxy)/"
-    # geoip.dat - cn-private
-    geoip_type=$(uci -q get mosdns.config.geoip_type || echo "geoip-only-cn-private")
-    echo -e "Downloading "$mirror"https://github.com/Loyalsoldier/geoip/releases/latest/download/"$geoip_type".dat"
-    curl --connect-timeout 5 -m 120 --ipv4 -kfSLo "$TMPDIR/geoip.dat" ""$mirror"https://github.com/Loyalsoldier/geoip/releases/latest/download/"$geoip_type".dat"
-    [ $? -ne 0 ] && rm -rf "$TMPDIR" && exit 1
-    # checksum - geoip.dat
-    echo -e "Downloading "$mirror"https://github.com/Loyalsoldier/geoip/releases/latest/download/"$geoip_type".dat.sha256sum"
-    curl --connect-timeout 5 -m 20 --ipv4 -kfSLo "$TMPDIR/geoip.dat.sha256sum" ""$mirror"https://github.com/Loyalsoldier/geoip/releases/latest/download/"$geoip_type".dat.sha256sum"
-    [ $? -ne 0 ] && rm -rf "$TMPDIR" && exit 1
-    if [ "$(sha256sum "$TMPDIR/geoip.dat" | awk '{print $1}')" != "$(cat "$TMPDIR/geoip.dat.sha256sum" | awk '{print $1}')" ]; then
-        echo -e "\e[1;31mgeoip.dat checksum error"
-        rm -rf "$TMPDIR"
-        exit 1
-    fi
-
-    # geosite.dat
-    echo -e "Downloading "$mirror"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat"
-    curl --connect-timeout 5 -m 120 --ipv4 -kfSLo "$TMPDIR/geosite.dat" ""$mirror"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat"
-    [ $? -ne 0 ] && rm -rf "$TMPDIR" && exit 1
-    # checksum - geosite.dat
-    echo -e "Downloading "$mirror"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat.sha256sum"
-    curl --connect-timeout 5 -m 20 --ipv4 -kfSLo "$TMPDIR/geosite.dat.sha256sum" ""$mirror"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat.sha256sum"
-    [ $? -ne 0 ] && rm -rf "$TMPDIR" && exit 1
-    if [ "$(sha256sum "$TMPDIR/geosite.dat" | awk '{print $1}')" != "$(cat "$TMPDIR/geosite.dat.sha256sum" | awk '{print $1}')" ]; then
-        echo -e "\e[1;31mgeosite.dat checksum error"
-        rm -rf "$TMPDIR"
-        exit 1
-    fi
-    rm -rf "$TMPDIR"/*.sha256sum
-    \cp -a "$TMPDIR"/* /usr/share/v2ray
-    rm -rf "$TMPDIR"
-)
-
-restart_service() {
-    /etc/init.d/mosdns restart
-}
-
-flush_cache() {
-    curl -s 127.0.0.1:$(uci -q get mosdns.config.listen_port_api)/plugins/lazy_cache/flush || exit 1
-}
-
-v2dat_dump() {
-    # env
-    v2dat_dir=/usr/share/v2ray
-    adblock=$(uci -q get mosdns.config.adblock)
-    ad_source=$(uci -q get mosdns.config.ad_source)
-    configfile=$(uci -q get mosdns.config.configfile)
-    streaming_media=$(uci -q get mosdns.config.custom_stream_media_dns)
-    mkdir -p /var/mosdns
-    rm -f /var/mosdns/geo*.txt
-    if [ "$configfile" = "/var/etc/mosdns.json" ]; then
-        # default config
-        v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat
-        v2dat unpack geosite -o /var/mosdns -f cn -f apple -f 'geolocation-!cn' $v2dat_dir/geosite.dat
-        [ "$adblock" = 1 ] && [ $(echo $ad_source | grep -c geosite.dat) -ge '1' ] && v2dat unpack geosite -o /var/mosdns -f category-ads-all $v2dat_dir/geosite.dat
-        [ "$streaming_media" = 1 ] && v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu $v2dat_dir/geosite.dat || \
-        touch /var/mosdns/geosite_disney.txt ; touch /var/mosdns/geosite_netflix.txt ; touch /var/mosdns/geosite_hulu.txt
-    else
-        # custom config
-        v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat
-        v2dat unpack geosite -o /var/mosdns -f cn -f 'geolocation-!cn' $v2dat_dir/geosite.dat
-        geoip_tags=$(uci -q get mosdns.config.geoip_tags)
-        geosite_tags=$(uci -q get mosdns.config.geosite_tags)
-        [ -n "$geoip_tags" ] && v2dat unpack geoip -o /var/mosdns $(echo $geoip_tags | sed -r 's/\S+/-f &/g') $v2dat_dir/geoip.dat
-        [ -n "$geosite_tags" ] && v2dat unpack geosite -o /var/mosdns $(echo $geosite_tags | sed -r 's/\S+/-f &/g') $v2dat_dir/geosite.dat
-    fi
-}
-
-case $script_action in
-    "dns")
-        interface_dns
-    ;;
-    "adlist")
-        get_adlist
-    ;;
-    "geodata")
-        geodat_update && adlist_update && restart_service
-    ;;
-    "logfile")
-        logfile_path
-    ;;
-    "adlist_update")
-        adlist_update && [ "$has_update" -eq 1 ] && restart_service
-    ;;
-    "flush")
-        flush_cache
-    ;;
-    "v2dat_dump")
-        v2dat_dump
-    ;;
-    "printlog")
-        print_logfile
-    ;;
-    "cleanlog")
-        clean_logfile
-    ;;
-    "version")
-        mosdns version
-    ;;
-    *)
-        exit 0
-    ;;
-esac
--- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc
+++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.uc
@ -0,0 +1,298 @@
+#!/usr/bin/env ucode
+
+'use strict';
+
+import { popen, mkdir, unlink, writefile, open, stat} from 'fs';
+import { cursor } from 'uci';
+import { connect } from 'ubus';
+
+function to_array(val) {
+	let res =[];
+	if (type(val) == 'array') {
+		for (let i = 0; i < length(val); i++) {
+			if (type(val[i]) == 'string') {
+				let s = replace(val[i], /^\s+|\s+$/g, '');
+				if (s != "") push(res, s);
+			}
+		}
+	} else if (type(val) == 'string') {
+		let parts = split(val, /[ \t\n]+/);
+		for (let i = 0; i < length(parts); i++) {
+			if (parts[i] != "") push(res, parts[i]);
+		}
+	}
+	return res;
+}
+
+function exec_sys(cmd) {
+	let p = popen(cmd + " 2>&1", "r");
+	if (!p) return { code: -1, stdout: "" };
+	let stdout = p.read("all");
+	let code = p.close();
+	if (type(stdout) == 'string') {
+		stdout = replace(stdout, /^\s+|\s+$/g, '');
+	}
+	return { code: code, stdout: stdout || "" };
+}
+
+function interface_dns() {
+	let uci_cursor = cursor();
+	uci_cursor.load('mosdns');
+	let dns_list =[];
+
+	if (uci_cursor.get('mosdns', 'config', 'custom_local_dns') === '1') {
+		dns_list = to_array(uci_cursor.get('mosdns', 'config', 'local_dns'));
+	} else {
+		uci_cursor.load('network');
+		let peerdns = uci_cursor.get('network', 'wan', 'peerdns');
+		let proto = uci_cursor.get('network', 'wan', 'proto');
+
+		if (peerdns === '0' || proto === 'static') {
+			dns_list = to_array(uci_cursor.get('network', 'wan', 'dns'));
+		} else {
+			let ubus_conn = connect();
+			if (ubus_conn) {
+				let status = ubus_conn.call('network.interface.wan', 'status');
+				if (status && type(status['dns-server']) == 'array' && length(status['dns-server']) > 0) {
+					dns_list = status['dns-server'];
+				}
+			}
+		}
+	}
+
+	if (length(dns_list) === 0) {
+		dns_list =['119.29.29.29', '223.5.5.5'];
+	}
+	print(join(" ", dns_list) + "\n");
+}
+
+function get_adlist() {
+	let uci_cursor = cursor();
+	uci_cursor.load('mosdns');
+	let adblock = uci_cursor.get('mosdns', 'config', 'adblock');
+
+	if (adblock !== '1') {
+		mkdir('/etc/mosdns/rule', 0755);
+		exec_sys('rm -rf /etc/mosdns/rule/adlist /etc/mosdns/rule/.ad_source');
+		writefile('/var/mosdns/disable-ads.txt', '');
+		print("/var/mosdns/disable-ads.txt\n");
+		return;
+	}
+
+	mkdir('/etc/mosdns/rule/adlist', 0755);
+	let ad_source = to_array(uci_cursor.get('mosdns', 'config', 'ad_source'));
+	let adlist =[];
+
+	for (let i = 0; i < length(ad_source); i++) {
+		let url = ad_source[i];
+		if (!url) continue;
+
+		if (url === 'geosite.dat') {
+			push(adlist, '/var/mosdns/geosite_category-ads-all.txt');
+		} else if (index(url, 'file://') === 0) {
+			push(adlist, substr(url, 7));
+		} else {
+			let parts = split(url, '/');
+			let filename = parts[length(parts) - 1];
+			let local_path = `/etc/mosdns/rule/adlist/${filename}`;
+			if (!stat(local_path)) {
+				writefile(local_path, '');
+			}
+			push(adlist, local_path);
+		}
+	}
+	print(join("\n", adlist) + "\n");
+}
+
+function update_adlist() {
+	let uci_cursor = cursor();
+	uci_cursor.load('mosdns');
+
+	if (uci_cursor.get('mosdns', 'config', 'adblock') !== '1') {
+		return false;
+	}
+
+	let lock_file = '/var/lock/mosdns_ad_update.lock';
+	let ad_source = to_array(uci_cursor.get('mosdns', 'config', 'ad_source'));
+	let github_proxy = uci_cursor.get('mosdns', 'config', 'github_proxy') || '';
+
+	mkdir('/etc/mosdns/rule', 0755);
+	writefile('/etc/mosdns/rule/.ad_source', '');
+
+	if (stat(lock_file)) return false;
+	writefile(lock_file, '');
+
+	let tmp_res = exec_sys('mktemp -d');
+	if (tmp_res.code !== 0) {
+		unlink(lock_file);
+		die("Failed to create temp directory for adlist.");
+	}
+	let ad_tmpdir = tmp_res.stdout;
+	let has_update = false;
+	let download_failed = false;
+
+	for (let i = 0; i < length(ad_source); i++) {
+		let url = ad_source[i];
+		if (!url) continue;
+
+		if (url !== 'geosite.dat' && index(url, 'file://') !== 0) {
+			has_update = true;
+			exec_sys(`echo "${url}" >> /etc/mosdns/rule/.ad_source`);
+
+			let parts = split(url, '/');
+			let filename = parts[length(parts) - 1];
+			let mirror = "";
+
+			if (match(url, /^https:\/\/raw\.githubusercontent\.com/)) {
+				mirror = github_proxy ? github_proxy + '/' : '';
+			}
+
+			print(`Downloading ${mirror}${url}\n`);
+			let curl_res = exec_sys(`curl --connect-timeout 5 -m 90 --ipv4 -kfSLo "${ad_tmpdir}/${filename}" "${mirror}${url}"`);
+			if (curl_res.code !== 0) download_failed = true;
+		}
+	}
+
+	if (download_failed) {
+		print("\x1b[1;31mRules download failed.\n");
+		exec_sys(`rm -rf "${ad_tmpdir}"`);
+		unlink(lock_file);
+		exit(1);
+	} else {
+		if (has_update) {
+			mkdir('/etc/mosdns/rule/adlist', 0755);
+			exec_sys('rm -rf /etc/mosdns/rule/adlist/*');
+			exec_sys(`cp "${ad_tmpdir}"/* /etc/mosdns/rule/adlist/`);
+		}
+	}
+
+	exec_sys(`rm -rf "${ad_tmpdir}"`);
+	unlink(lock_file);
+
+	return has_update;
+}
+
+function update_geodat() {
+	let uci_cursor = cursor();
+	uci_cursor.load('mosdns');
+
+	let github_proxy = uci_cursor.get('mosdns', 'config', 'github_proxy') || '';
+	let mirror = github_proxy ? github_proxy + '/' : '';
+	let geoip_type = uci_cursor.get('mosdns', 'config', 'geoip_type') || 'geoip-only-cn-private';
+	let v2dat_dir = '/usr/share/v2ray';
+
+	let tmp_res = exec_sys('mktemp -d');
+	if (tmp_res.code !== 0) exit(1);
+	let tmpdir = tmp_res.stdout;
+
+	let geoip_url = mirror + "https://github.com/Loyalsoldier/geoip/releases/latest/download/" + geoip_type + ".dat";
+	print(`Downloading ${geoip_url}\n`);
+	if (exec_sys(`curl --connect-timeout 5 -m 120 --ipv4 -kfSLo "${tmpdir}/geoip.dat" "${geoip_url}"`).code !== 0) {
+		exec_sys(`rm -rf "${tmpdir}"`); exit(1);
+	}
+
+	print(`Downloading ${geoip_url}.sha256sum\n`);
+	if (exec_sys(`curl --connect-timeout 5 -m 20 --ipv4 -kfSLo "${tmpdir}/geoip.dat.sha256sum" "${geoip_url}.sha256sum"`).code !== 0) {
+		exec_sys(`rm -rf "${tmpdir}"`); exit(1);
+	}
+
+	let sum_local = split(exec_sys(`sha256sum "${tmpdir}/geoip.dat"`).stdout, /[ \t\n]+/)[0];
+	let sum_remote = split(exec_sys(`cat "${tmpdir}/geoip.dat.sha256sum"`).stdout, /[ \t\n]+/)[0];
+	if (sum_local !== sum_remote) {
+		print("\x1b[1;31mgeoip.dat checksum error\n");
+		exec_sys(`rm -rf "${tmpdir}"`); exit(1);
+	}
+
+	let geosite_url = mirror + "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat";
+	print(`Downloading ${geosite_url}\n`);
+	if (exec_sys(`curl --connect-timeout 5 -m 120 --ipv4 -kfSLo "${tmpdir}/geosite.dat" "${geosite_url}"`).code !== 0) {
+		exec_sys(`rm -rf "${tmpdir}"`); exit(1);
+	}
+
+	print(`Downloading ${geosite_url}.sha256sum\n`);
+	if (exec_sys(`curl --connect-timeout 5 -m 20 --ipv4 -kfSLo "${tmpdir}/geosite.dat.sha256sum" "${geosite_url}.sha256sum"`).code !== 0) {
+		exec_sys(`rm -rf "${tmpdir}"`); exit(1);
+	}
+
+	sum_local = split(exec_sys(`sha256sum "${tmpdir}/geosite.dat"`).stdout, /[ \t\n]+/)[0];
+	sum_remote = split(exec_sys(`cat "${tmpdir}/geosite.dat.sha256sum"`).stdout, /[ \t\n]+/)[0];
+	if (sum_local !== sum_remote) {
+		print("\x1b[1;31mgeosite.dat checksum error\n");
+		exec_sys(`rm -rf "${tmpdir}"`); exit(1);
+	}
+
+	exec_sys(`rm -rf "${tmpdir}"/*.sha256sum`);
+	exec_sys(`cp -a "${tmpdir}"/* "${v2dat_dir}/"`);
+	exec_sys(`rm -rf "${tmpdir}"`);
+}
+
+function v2dat_dump() {
+	let uci_cursor = cursor();
+	uci_cursor.load('mosdns');
+	let v2dat_dir = '/usr/share/v2ray';
+	let configfile = uci_cursor.get('mosdns', 'config', 'configfile') || '/var/etc/mosdns.json';
+	let adblock = uci_cursor.get('mosdns', 'config', 'adblock');
+	let ad_source = uci_cursor.get('mosdns', 'config', 'ad_source') || "";
+	let streaming_media = uci_cursor.get('mosdns', 'config', 'custom_stream_media_dns');
+
+	mkdir('/var/mosdns', 0755);
+	exec_sys('rm -f /var/mosdns/geo*.txt');
+
+	if (configfile === "/var/etc/mosdns.json") {
+		exec_sys(`v2dat unpack geoip -o /var/mosdns -f cn ${v2dat_dir}/geoip.dat`);
+		exec_sys(`v2dat unpack geosite -o /var/mosdns -f cn -f apple -f 'geolocation-!cn' ${v2dat_dir}/geosite.dat`);
+
+		if (adblock === '1' && index(ad_source, 'geosite.dat') !== -1) {
+			exec_sys(`v2dat unpack geosite -o /var/mosdns -f category-ads-all ${v2dat_dir}/geosite.dat`);
+		}
+
+		if (streaming_media === '1') {
+			exec_sys(`v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu ${v2dat_dir}/geosite.dat`);
+		} else {
+			writefile('/var/mosdns/geosite_disney.txt', '');
+			writefile('/var/mosdns/geosite_netflix.txt', '');
+			writefile('/var/mosdns/geosite_hulu.txt', '');
+		}
+	} else {
+		exec_sys(`v2dat unpack geoip -o /var/mosdns -f cn ${v2dat_dir}/geoip.dat`);
+		exec_sys(`v2dat unpack geosite -o /var/mosdns -f cn -f 'geolocation-!cn' ${v2dat_dir}/geosite.dat`);
+
+		let geoip_tags = to_array(uci_cursor.get('mosdns', 'config', 'geoip_tags'));
+		if (length(geoip_tags) > 0) {
+			let tags_str = "-f '" + join("' -f '", geoip_tags) + "'";
+			exec_sys(`v2dat unpack geoip -o /var/mosdns ${tags_str} ${v2dat_dir}/geoip.dat`);
+		}
+
+		let geosite_tags = to_array(uci_cursor.get('mosdns', 'config', 'geosite_tags'));
+		if (length(geosite_tags) > 0) {
+			let tags_str = "-f '" + join("' -f '", geosite_tags) + "'";
+			exec_sys(`v2dat unpack geosite -o /var/mosdns ${tags_str} ${v2dat_dir}/geosite.dat`);
+		}
+	}
+}
+
+let action = ARGV[0];
+
+switch (action) {
+	case "interface_dns":
+		interface_dns();
+		break;
+	case "get_adlist":
+		get_adlist();
+		break;
+	case "update":
+		update_geodat();
+		update_adlist();
+		exec_sys('/etc/init.d/mosdns restart');
+		break;
+	case "update_adlist":
+		if (update_adlist()) {
+			exec_sys('/etc/init.d/mosdns restart');
+		}
+		break;
+	case "v2dat_dump":
+		v2dat_dump();
+		break;
+	default:
+		exit(0);
+}
--- a/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
+++ b/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
@ -5,36 +5,33 @@
 			"file": {
 				"/etc/init.d/mosdns": [ "exec" ],
 				"/etc/mosdns/config_custom.yaml": [ "read" ],
-				"/etc/mosdns/rule/blocklist.txt": [ "read" ],
-				"/etc/mosdns/rule/cloudflare-cidr.txt": [ "read" ],
-				"/etc/mosdns/rule/ddnslist.txt": [ "read" ],
-				"/etc/mosdns/rule/greylist.txt": [ "read" ],
-				"/etc/mosdns/rule/hosts.txt": [ "read" ],
-				"/etc/mosdns/rule/local-ptr.txt": [ "read" ],
-				"/etc/mosdns/rule/redirect.txt": [ "read" ],
-				"/etc/mosdns/rule/streaming.txt": [ "read" ],
-				"/etc/mosdns/rule/whitelist.txt": [ "read" ],
+				"/etc/mosdns/rule/*": [ "read" ],
 				"/usr/bin/mosdns": [ "exec" ],
-				"/usr/share/mosdns/mosdns.sh": [ "exec" ]
+				"/usr/share/mosdns/mosdns.uc": [ "exec" ],
+				"/var/log/*": [ "read" ],
+				"/var/mosdns/*": [ "read" ]
 			},
 			"ubus": {
 				"file": [ "read" ],
-				"service": [ "list" ]
+				"service": [ "list" ],
+				"luci.mosdns": [
+					"clean_log",
+					"flush_cache",
+					"get_version",
+					"print_log",
+					"restart"
+				]
 			},
 			"uci": [ "mosdns" ]
 		},
 		"write": {
 			"file": {
 				"/etc/mosdns/config_custom.yaml": [ "write" ],
-				"/etc/mosdns/rule/blocklist.txt": [ "write" ],
-				"/etc/mosdns/rule/cloudflare-cidr.txt": [ "write" ],
-				"/etc/mosdns/rule/ddnslist.txt": [ "write" ],
-				"/etc/mosdns/rule/greylist.txt": [ "write" ],
-				"/etc/mosdns/rule/hosts.txt": [ "write" ],
-				"/etc/mosdns/rule/local-ptr.txt": [ "write" ],
-				"/etc/mosdns/rule/redirect.txt": [ "write" ],
-				"/etc/mosdns/rule/streaming.txt": [ "write" ],
-				"/etc/mosdns/rule/whitelist.txt": [ "write" ]
+				"/etc/mosdns/rule/*": [ "write" ],
+				"/usr/share/mosdns/*": [ "write" ],
+				"/usr/share/v2ray/*": [ "write" ],
+				"/var/log/*": [ "write" ],
+				"/var/mosdns/*": [ "write" ]
 			},
 			"ubus": {
 				"file": [ "write" ]
@ -43,4 +40,3 @@
 		}
 	}
 }
-
--- a/luci-app-mosdns/root/usr/share/rpcd/ucode/mosdns.uc
+++ b/luci-app-mosdns/root/usr/share/rpcd/ucode/mosdns.uc
@ -0,0 +1,126 @@
+#!/usr/bin/env ucode
+
+'use strict';
+
+import { popen, writefile, stat, readfile } from 'fs';
+import { cursor } from 'uci';
+
+function to_array(val) {
+	let res =[];
+	if (type(val) == 'array') {
+		for (let i = 0; i < length(val); i++) {
+			if (type(val[i]) == 'string') {
+				let s = replace(val[i], /^\s+|\s+$/g, '');
+				if (s != "") push(res, s);
+			}
+		}
+	} else if (type(val) == 'string') {
+		let parts = split(val, /[ \t\n]+/);
+		for (let i = 0; i < length(parts); i++) {
+			if (parts[i] != "") push(res, parts[i]);
+		}
+	}
+	return res;
+}
+
+function exec_sys(cmd) {
+	let p = popen(cmd + " 2>&1", "r");
+	if (!p) return { code: -1, stdout: "" };
+	let stdout = p.read("all");
+	let code = p.close();
+	if (type(stdout) == 'string') {
+		stdout = replace(stdout, /^\s+|\s+$/g, '');
+	}
+	return { code: code, stdout: stdout || "" };
+}
+
+function restart_mosdns() {
+	let p = popen('(sleep 1; /etc/init.d/mosdns restart) >/dev/null 2>&1 &', 'r');
+	if (p) p.close();
+}
+
+function get_logfile_path_internal() {
+	let uci_cursor = cursor();
+	uci_cursor.load('mosdns');
+	let configfile = uci_cursor.get('mosdns', 'config', 'configfile');
+
+	if (configfile === '/var/etc/mosdns.json' || !configfile) {
+		return uci_cursor.get('mosdns', 'config', 'log_file');
+	} else {
+		return '/var/log/mosdns.log';
+	}
+	return null;
+}
+
+const methods = {
+	flush_cache: {
+		call: function() {
+			try {
+				let uci_cursor = cursor();
+				uci_cursor.load('mosdns');
+				let port = uci_cursor.get('mosdns', 'config', 'listen_port_api');
+				if (!port) return { error: "API listen port not configured." };
+
+				let res = exec_sys(`curl -s 127.0.0.1:${port}/plugins/lazy_cache/flush`);
+				if (res.code === 0) {
+					return { success: true };
+				} else {
+					return { success: false, error: res.stdout };
+				}
+			} catch (e) {
+				return { error: String(e) };
+			}
+		}
+	},
+
+	print_log: {
+		call: function() {
+			try {
+				let path = get_logfile_path_internal();
+				if (path && stat(path)) {
+					return { log: readfile(path) };
+				} else {
+					return { error: 'Log file not accessible or does not exist.' };
+				}
+			} catch (e) {
+				return { error: String(e) };
+			}
+		}
+	},
+
+	clean_log: {
+		call: function() {
+			try {
+				let path = get_logfile_path_internal();
+				if (path) {
+					writefile(path, '');
+					return { success: true };
+				} else {
+					return { error: 'Log file path could not be determined.' };
+				}
+			} catch (e) {
+				return { error: String(e) };
+			}
+		}
+	},
+
+	get_version: {
+		call: function() {
+			let res = exec_sys('mosdns version');
+			if (res.code === 0) {
+				return { version: res.stdout };
+			} else {
+				return { error: res.stdout };
+			}
+		}
+	},
+
+	restart: {
+		call: function() {
+			restart_mosdns();
+			return { code: 0, output: "mosdns is restarting in background." };
+		}
+	}
+};
+
+return { "luci.mosdns": methods };
--- a/luci-app-mtphotos/Makefile
+++ b/luci-app-mtphotos/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for MTPhotos
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-mtphotos/conffiles
 /etc/config/mtphotos
--- a/luci-app-nastools/Makefile
+++ b/luci-app-nastools/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.3-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for nastools
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-nastools/conffiles
 /etc/config/nastools
--- a/luci-app-navidrome/Makefile
+++ b/luci-app-navidrome/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.1-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Navidrome
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-navidrome/conffiles
 /etc/config/navidrome
--- a/luci-app-nextcloud/Makefile
+++ b/luci-app-nextcloud/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.1-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for nextcloud
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-nextcloud/conffiles
 /etc/config/nextcloud
--- a/luci-app-oneapi/Makefile
+++ b/luci-app-oneapi/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.1-20250403
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for OneAPI
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-oneapi/conffiles
 /etc/config/oneapi
--- a/luci-app-openwebui/Makefile
+++ b/luci-app-openwebui/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.8-20250207
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for OpenWebUI
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-openwebui/conffiles
 /etc/config/openwebui
--- a/luci-app-owntone/Makefile
+++ b/luci-app-owntone/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Owntone
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-owntone/conffiles
 /etc/config/owntone
--- a/luci-app-penpot/Makefile
+++ b/luci-app-penpot/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.0-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Penpot
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +docker-compose
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +docker-compose

 define Package/luci-app-penpot/conffiles
 /etc/config/penpot
--- a/luci-app-photoprism/Makefile
+++ b/luci-app-photoprism/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.3-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for PhotoPrism
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-photoprism/conffiles
 /etc/config/photoprism
--- a/luci-app-plex/Makefile
+++ b/luci-app-plex/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Plex
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-plex/conffiles
 /etc/config/plex
--- a/luci-app-pve/Makefile
+++ b/luci-app-pve/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=8.3.2-20250106
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for pve
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +vmease
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +vmease

 define Package/luci-app-pve/conffiles
 /etc/config/pve
--- a/luci-app-runmynas/Makefile
+++ b/luci-app-runmynas/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.1-20231208
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for runmynas
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+docker +dockerd +luci-lib-iform +luci-lib-taskd
+LUCI_DEPENDS:=+docker +luci-lib-iform +luci-lib-taskd
 LUCI_EXTRA_DEPENDS:=luci-lib-iform (>=1.1)

 define Package/luci-app-runmynas/conffiles
--- a/luci-app-shadowrt/Makefile
+++ b/luci-app-shadowrt/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.7-r1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for shadowrt
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +docker-lan-bridge +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +docker-lan-bridge +luci-lib-taskd

 define Package/luci-app-shadowrt/conffiles
 /etc/config/shadowrt
--- a/luci-app-typecho/Makefile
+++ b/luci-app-typecho/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for TypeCho
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-typecho/conffiles
 /etc/config/typecho
--- a/luci-app-ubuntu/Makefile
+++ b/luci-app-ubuntu/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.1-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for ubuntu
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+docker +dockerd +luci-lib-iform +luci-lib-taskd
+LUCI_DEPENDS:=+docker +luci-lib-iform +luci-lib-taskd
 LUCI_EXTRA_DEPENDS:=luci-lib-iform (>=1.1)

 define Package/luci-app-ubuntu/conffiles
--- a/luci-app-ubuntu2/Makefile
+++ b/luci-app-ubuntu2/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.0-20251012
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Ubuntu2
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-ubuntu2/conffiles
 /etc/config/ubuntu2
--- a/luci-app-unifi/Makefile
+++ b/luci-app-unifi/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for UnifiController
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-unifi/conffiles
 /etc/config/unifi
--- a/luci-app-uptimekuma/Makefile
+++ b/luci-app-uptimekuma/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.1-20251011
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for UptimeKuma
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +zoneinfo-asia +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-uptimekuma/conffiles
 /etc/config/uptimekuma
--- a/luci-app-vaultwarden/Makefile
+++ b/luci-app-vaultwarden/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.1-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Vaultwarden
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-vaultwarden/conffiles
 /etc/config/vaultwarden
--- a/luci-app-webvirtcloud/Makefile
+++ b/luci-app-webvirtcloud/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=0.8.5-20241221-1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for webvirtcloud
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +vmease
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +vmease

 define Package/luci-app-webvirtcloud/conffiles
 /etc/config/webvirtcloud
--- a/luci-app-wxedge/Makefile
+++ b/luci-app-wxedge/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.1.7-20250516
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for wxedge
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-wxedge/conffiles
 /etc/config/wxedge
--- a/luci-app-xteve/Makefile
+++ b/luci-app-xteve/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.2-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Xteve
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker

 define Package/luci-app-xteve/conffiles
 /etc/config/xteve
--- a/luci-app-xunlei/Makefile
+++ b/luci-app-xunlei/Makefile
@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk

 PKG_VERSION:=1.0.3-20240822
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 LUCI_TITLE:=LuCI support for Xunlei
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd

 define Package/luci-app-xunlei/conffiles
 /etc/config/xunlei
--- a/luci-app-zdinnav/Makefile
+++ b/luci-app-zdinnav/Makefile
@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=luci-app-zdinnav
 LUCI_TITLE:=LuCI support for ZdinNav
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker +docker-compose +luci-compat
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd +luci-lib-docker +docker-compose +luci-compat

 PKG_MAINTAINER:=tkme <tkme@qq.com>

 PKG_VERSION:=1.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 define Package/luci-app-zdinnav/conffiles
 /etc/config/zdinnav
--- a/mosdns/Makefile
+++ b/mosdns/Makefile
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=mosdns
 PKG_VERSION:=5.3.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/IrineSistiana/mosdns/tar.gz/v$(PKG_VERSION)?
--- a/mosdns/patches/100-mosdns-update-dependencies.patch
+++ b/mosdns/patches/100-mosdns-update-dependencies.patch
@ -0,0 +1,238 @@
+From 201408484de552cb927f6a50b76a34d65c8ac8c6 Mon Sep 17 00:00:00 2001
+From: sbwml <admin@cooluc.com>
+Date: Fri, 20 Mar 2026 10:39:22 +0800
+Subject: [PATCH] mosdns: update dependencies
+
+Signed-off-by: sbwml <admin@cooluc.com>
+---
+ .github/workflows/release.yml |  2 +-
+ .github/workflows/test.yml    |  2 +-
+ go.mod                        | 36 +++++++++----------
+ go.sum                        | 68 +++++++++++++++++------------------
+ pkg/query_context/context.go  |  1 -
+ 5 files changed, 54 insertions(+), 55 deletions(-)
+
+--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
+@@ -14,7 +14,7 @@ jobs:
+       - name: Set up Go
+         uses: actions/setup-go@v6
+         with:
+-          go-version: "1.25"
+          go-version: "1.26"
+           check-latest: true
+           cache: true
+ 
+--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
+@@ -12,7 +12,7 @@ jobs:
+       - name: Set up Go
+         uses: actions/setup-go@v6
+         with:
+-          go-version: "1.25"
+          go-version: "1.26"
+           check-latest: true
+           cache: true
+ 
+--- a/go.mod
+++ b/go.mod
+@@ -1,30 +1,30 @@
+ module github.com/IrineSistiana/mosdns/v5
+ 
+-go 1.24.9
+go 1.25.0
+ 
+ require (
+ 	github.com/IrineSistiana/go-bytes-pool v0.0.0-20230918115058-c72bd9761c57
+-	github.com/go-chi/chi/v5 v5.2.3
+-	github.com/go-viper/mapstructure/v2 v2.4.0
+	github.com/go-chi/chi/v5 v5.2.5
+	github.com/go-viper/mapstructure/v2 v2.5.0
+ 	github.com/google/nftables v0.3.0
+ 	github.com/kardianos/service v1.2.4
+-	github.com/klauspost/compress v1.18.2
+-	github.com/miekg/dns v1.1.70
+	github.com/klauspost/compress v1.18.4
+	github.com/miekg/dns v1.1.72
+ 	github.com/mitchellh/mapstructure v1.5.0
+ 	github.com/nadoo/ipset v0.5.0
+ 	github.com/prometheus/client_golang v1.23.2
+-	github.com/quic-go/quic-go v0.58.1
+	github.com/quic-go/quic-go v0.59.0
+ 	github.com/spf13/cobra v1.10.2
+ 	github.com/spf13/viper v1.21.0
+ 	github.com/stretchr/testify v1.11.1
+ 	github.com/vishvananda/netlink v1.3.0
+ 	go.uber.org/zap v1.27.1
+ 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
+-	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
+-	golang.org/x/net v0.48.0
+-	golang.org/x/sync v0.19.0
+-	golang.org/x/sys v0.40.0
+-	golang.org/x/time v0.14.0
+	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90
+	golang.org/x/net v0.52.0
+	golang.org/x/sync v0.20.0
+	golang.org/x/sys v0.42.0
+	golang.org/x/time v0.15.0
+ 	google.golang.org/protobuf v1.36.11
+ )
+ 
+@@ -37,14 +37,14 @@ require (
+ 	github.com/fsnotify/fsnotify v1.9.0 // indirect
+ 	github.com/google/go-cmp v0.7.0 // indirect
+ 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+-	github.com/mdlayher/netlink v1.8.0 // indirect
+	github.com/mdlayher/netlink v1.9.0 // indirect
+ 	github.com/mdlayher/socket v0.5.1 // indirect
+ 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+ 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+ 	github.com/prometheus/client_model v0.6.2 // indirect
+ 	github.com/prometheus/common v0.67.5 // indirect
+-	github.com/prometheus/procfs v0.19.2 // indirect
+	github.com/prometheus/procfs v0.20.1 // indirect
+ 	github.com/quic-go/qpack v0.6.0 // indirect
+ 	github.com/rogpeppe/go-internal v1.13.1 // indirect
+ 	github.com/sagikazarmark/locafero v0.12.0 // indirect
+@@ -55,11 +55,11 @@ require (
+ 	github.com/vishvananda/netns v0.0.4 // indirect
+ 	go.uber.org/mock v0.6.0 // indirect
+ 	go.uber.org/multierr v1.11.0 // indirect
+-	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v2 v2.4.4 // indirect
+ 	go.yaml.in/yaml/v3 v3.0.4 // indirect
+-	golang.org/x/crypto v0.46.0 // indirect
+-	golang.org/x/mod v0.32.0 // indirect
+-	golang.org/x/text v0.33.0 // indirect
+-	golang.org/x/tools v0.40.0 // indirect
+	golang.org/x/crypto v0.49.0 // indirect
+	golang.org/x/mod v0.34.0 // indirect
+	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/tools v0.43.0 // indirect
+ 	gopkg.in/yaml.v3 v3.0.1 // indirect
+ )
+--- a/go.sum
+++ b/go.sum
+@@ -13,10 +13,10 @@ github.com/frankban/quicktest v1.14.6 h1
+ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+ github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+-github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
+-github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+-github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
+github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
+github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
+github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+ github.com/google/nftables v0.3.0 h1:bkyZ0cbpVeMHXOrtlFc8ISmfVqq5gPJukoYieyVmITg=
+@@ -25,20 +25,20 @@ github.com/inconshreveable/mousetrap v1.
+ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+ github.com/kardianos/service v1.2.4 h1:XNlGtZOYNx2u91urOdg/Kfmc+gfmuIo1Dd3rEi2OgBk=
+ github.com/kardianos/service v1.2.4/go.mod h1:E4V9ufUuY82F7Ztlu1eN9VXWIQxg8NoLQlmFe0MtrXc=
+-github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
+-github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
+github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+ github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+-github.com/mdlayher/netlink v1.8.0 h1:e7XNIYJKD7hUct3Px04RuIGJbBxy1/c4nX7D5YyvvlM=
+-github.com/mdlayher/netlink v1.8.0/go.mod h1:UhgKXUlDQhzb09DrCl2GuRNEglHmhYoWAHid9HK3594=
+github.com/mdlayher/netlink v1.9.0 h1:G8+GLq2x3v4D4MVIqDdNUhTUC7TKiCy/6MDkmItfKco=
+github.com/mdlayher/netlink v1.9.0/go.mod h1:YBnl5BXsCoRuwBjKKlZ+aYmEoq0r12FDA/3JC+94KDg=
+ github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
+ github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
+-github.com/miekg/dns v1.1.70 h1:DZ4u2AV35VJxdD9Fo9fIWm119BsQL5cZU1cQ9s0LkqA=
+-github.com/miekg/dns v1.1.70/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
+github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=
+github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
+ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+@@ -53,12 +53,12 @@ github.com/prometheus/client_model v0.6.
+ github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+ github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
+ github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
+-github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
+-github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
+github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc=
+github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo=
+ github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+ github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+-github.com/quic-go/quic-go v0.58.1 h1:J0s55TVauDbnCEY5tU2B8e7nYb3gnKMSez5Fwi1dl2s=
+-github.com/quic-go/quic-go v0.58.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
+github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+ github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+@@ -91,32 +91,32 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSx
+ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+ go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+-go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+-go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
+go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
+ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
+ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
+-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+-golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
+-golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
+-golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+-golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
+-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
+golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
+golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 h1:jiDhWWeC7jfWqR9c/uplMOqJ0sbNlNWv0UkzE0vX1MA=
+golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90/go.mod h1:xE1HEv6b+1SCZ5/uscMRjUBKtIxworgEcEi+/n9NQDQ=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
+golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+-golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
+-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
+golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
+golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
+ google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+--- a/pkg/query_context/context.go
+++ b/pkg/query_context/context.go
+@@ -108,7 +108,6 @@ func (ctx *Context) QQuestion() dns.Ques
+ // It's a helper func for searching opt in Q() manually.
+ func (ctx *Context) QOpt() *dns.OPT {
+ 	opt := findOpt(ctx.query)
+-	ctx.query.IsEdns0()
+ 	if opt == nil {
+ 		panic("query opt is missing")
+ 	}
--- a/nikki/Makefile
+++ b/nikki/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=nikki
 PKG_VERSION:=2026.03.10
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/nikki/files/nikki.init
+++ b/nikki/files/nikki.init
@ -28,7 +28,7 @@ boot_func() {
 }

 boot() {
-	boot_func &
+	boot_func < /dev/null > /dev/null 2>&1 &
 }

 start_service() {
--- a/nikki/files/ucode/include.uc
+++ b/nikki/files/ucode/include.uc
@ -78,7 +78,7 @@ export function get_cgroups() {

 export function load_profile() {
 	let result = {};
-	const process = popen('yq -M -p yaml -o json /etc/nikki/run/config.yaml 2>/dev/null');
+	const process = popen('yq -M -p yaml -o json /etc/nikki/run/config.yaml');
 	if (process) {
 		result = json(process);
 		process.close();
--- a/routergo/Makefile
+++ b/routergo/Makefile
@ -11,7 +11,7 @@ PKG_ARCH_routergo:=$(ARCH)

 PKG_NAME:=routergo
 PKG_VERSION:=0.14.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/Carseason/openwrt-packages/releases/download/prebuilt/
 PKG_HASH:=skip
@ -27,7 +27,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Network
 	SUBMENU:=Web Servers/Proxies
 	TITLE:=RouterGo
-	DEPENDS:=@(x86_64||aarch64||arm) +docker +dockerd +luci-app-linkease
+	DEPENDS:=@(x86_64||aarch64||arm) +docker +luci-app-linkease
 	URL:=https://github.com/Carseason/openwrt-packages
 endef

--- a/v2dat/Makefile
+++ b/v2dat/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=v2dat
 PKG_SOURCE_DATE:=2022-12-15
 PKG_SOURCE_VERSION:=47b8ee51fb528e11e1a83453b7e767a18d20d1f7
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/urlesistiana/v2dat/tar.gz/$(PKG_SOURCE_VERSION)?
--- a/v2dat/patches/100-format-logtime.patch
+++ b/v2dat/patches/100-format-logtime.patch
@ -1,7 +1,7 @@
-From 7c6a252ab3f7d9aeb743f9fa8d0cc8c7402f984d Mon Sep 17 00:00:00 2001
+From 226cb45cc97c52fc0383a5b5172a131f65921f4a Mon Sep 17 00:00:00 2001
 From: sbwml <admin@cooluc.com>
 Date: Wed, 20 Sep 2023 20:52:27 +0800
-Subject: [PATCH] format logtime
+Subject: [PATCH 1/3] format logtime

 ---
 mlog/logger.go | 15 +++++++++++++--
--- a/v2dat/patches/101-v2dat-update-dependencies.patch
+++ b/v2dat/patches/101-v2dat-update-dependencies.patch
@ -1,44 +1,44 @@
-From d5f31a032bae130c83bb50b8679776cf1b33f05d Mon Sep 17 00:00:00 2001
+From 0e465de6bc63d71dd7371209bbaaf9350e2fc567 Mon Sep 17 00:00:00 2001
 From: sbwml <admin@cooluc.com>
-Date: Mon, 30 Jun 2025 15:08:51 +0800
-Subject: [PATCH] v2dat: update dependencies
+Date: Fri, 20 Mar 2026 09:45:03 +0800
+Subject: [PATCH 2/3] v2dat: update dependencies

 Signed-off-by: sbwml <admin@cooluc.com>
 ---
- go.mod | 14 ++++++--------
- go.sum | 41 +++++++++++++----------------------------
- 2 files changed, 19 insertions(+), 36 deletions(-)
+ go.mod | 15 ++++++---------
+ go.sum | 47 +++++++++++++++++------------------------------
+ 2 files changed, 23 insertions(+), 39 deletions(-)

 --- a/go.mod
 +++ b/go.mod
-@@ -1,18 +1,16 @@
+@@ -1,18 +1,15 @@
 module github.com/urlesistiana/v2dat
 
 -go 1.19
-+go 1.22
+go 1.23
 
 require (
 -	github.com/spf13/cobra v1.6.1
 -	go.uber.org/zap v1.24.0
 -	google.golang.org/protobuf v1.28.1
-+	github.com/spf13/cobra v1.9.1
-+	go.uber.org/zap v1.27.0
-+	google.golang.org/protobuf v1.36.6
+	github.com/spf13/cobra v1.10.2
+	go.uber.org/zap v1.27.1
+	google.golang.org/protobuf v1.36.11
 )
 
 require (
- 	github.com/google/go-cmp v0.5.9 // indirect
+-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 -	github.com/spf13/pflag v1.0.5 // indirect
 -	github.com/stretchr/testify v1.8.1 // indirect
 -	go.uber.org/atomic v1.10.0 // indirect
 -	go.uber.org/multierr v1.9.0 // indirect
-+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
 +	go.uber.org/multierr v1.11.0 // indirect
 )
 --- a/go.sum
 +++ b/go.sum
-@@ -1,42 +1,27 @@
+@@ -1,42 +1,29 @@
 -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -47,9 +47,11 @@ Signed-off-by: sbwml <admin@cooluc.com>
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
- github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
@ -65,10 +67,11 @@ Signed-off-by: sbwml <admin@cooluc.com>
 -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
-+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
@ -86,10 +89,11 @@ Signed-off-by: sbwml <admin@cooluc.com>
 +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
-+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/v2dat/patches/102-perf-unpack-Use-memory-mapping-to-reduce-memory-usag.patch
+++ b/v2dat/patches/102-perf-unpack-Use-memory-mapping-to-reduce-memory-usag.patch
@ -0,0 +1,128 @@
+From 0c6f9a36049423283052dfaf6eb9e211afe95c89 Mon Sep 17 00:00:00 2001
+From: sbwml <admin@cooluc.com>
+Date: Fri, 20 Mar 2026 10:11:24 +0800
+Subject: [PATCH 3/3] perf(unpack): Use memory mapping to reduce memory usage
+
+Replaced `os.ReadFile` with `mmap` to avoid loading the entire geoip.dat
+or geosite.dat file into memory during unpacking. This fixes
+out-of-memory errors on low-memory devices.
+
+Signed-off-by: sbwml <admin@cooluc.com>
+---
+ cmd/unpack/geoip.go   | 18 ++++++++++++++----
+ cmd/unpack/geosite.go | 11 ++++++++++-
+ go.mod                |  4 +++-
+ go.sum                |  4 ++++
+ 4 files changed, 31 insertions(+), 6 deletions(-)
+
+--- a/cmd/unpack/geoip.go
+++ b/cmd/unpack/geoip.go
+@@ -3,14 +3,16 @@ package unpack
+ import (
+ 	"bufio"
+ 	"fmt"
+-	"github.com/spf13/cobra"
+-	"github.com/urlesistiana/v2dat/v2data"
+-	"go.uber.org/zap"
+ 	"io"
+ 	"net/netip"
+ 	"os"
+ 	"path/filepath"
+ 	"strings"
+
+	"github.com/edsrzf/mmap-go"
+	"github.com/spf13/cobra"
+	"github.com/urlesistiana/v2dat/v2data"
+	"go.uber.org/zap"
+ )
+ 
+ func newGeoIPCmd() *cobra.Command {
+@@ -34,10 +36,18 @@ func newGeoIPCmd() *cobra.Command {
+ 
+ func unpackGeoIP(args *unpackArgs) error {
+ 	filePath, wantTags, ourDir := args.file, args.filters, args.outDir
+-	b, err := os.ReadFile(filePath)
+
+	file, err := os.Open(filePath)
+ 	if err != nil {
+ 		return err
+ 	}
+	defer file.Close()
+
+	b, err := mmap.Map(file, mmap.RDONLY, 0)
+	if err != nil {
+		return fmt.Errorf("error mapping file: %w", err)
+	}
+	defer b.Unmap()
+ 	geoIPList, err := v2data.LoadGeoIPListFromDAT(b)
+ 	if err != nil {
+ 		return err
+--- a/cmd/unpack/geosite.go
+++ b/cmd/unpack/geosite.go
+@@ -3,6 +3,7 @@ package unpack
+ import (
+ 	"bufio"
+ 	"fmt"
+	"github.com/edsrzf/mmap-go"
+ 	"github.com/spf13/cobra"
+ 	"github.com/urlesistiana/v2dat/v2data"
+ 	"go.uber.org/zap"
+@@ -39,10 +40,18 @@ func newGeoSiteCmd() *cobra.Command {
+ 
+ func unpackGeoSite(args *unpackArgs) error {
+ 	filePath, suffixes, outDir := args.file, args.filters, args.outDir
+-	b, err := os.ReadFile(filePath)
+
+	file, err := os.Open(filePath)
+ 	if err != nil {
+ 		return err
+ 	}
+	defer file.Close()
+
+	b, err := mmap.Map(file, mmap.RDONLY, 0)
+	if err != nil {
+		return fmt.Errorf("error mapping file: %w", err)
+	}
+	defer b.Unmap()
+ 	geoSiteList, err := v2data.LoadGeoSiteList(b)
+ 	if err != nil {
+ 		return err
+--- a/go.mod
+++ b/go.mod
+@@ -1,8 +1,9 @@
+ module github.com/urlesistiana/v2dat
+ 
+-go 1.23
+go 1.25.0
+ 
+ require (
+	github.com/edsrzf/mmap-go v1.2.0
+ 	github.com/spf13/cobra v1.10.2
+ 	go.uber.org/zap v1.27.1
+ 	google.golang.org/protobuf v1.36.11
+@@ -12,4 +13,5 @@ require (
+ 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+ 	github.com/spf13/pflag v1.0.10 // indirect
+ 	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
+ )
+--- a/go.sum
+++ b/go.sum
+@@ -1,6 +1,8 @@
+ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
+github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
+ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+@@ -22,6 +24,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:2
+ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+ go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+ go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+ google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=