diff --git a/luci-app-adguardhome/docs/README.en.md b/docs/README.en.md similarity index 100% rename from luci-app-adguardhome/docs/README.en.md rename to docs/README.en.md diff --git a/luci-app-adguardhome/docs/README.md b/docs/README.md similarity index 100% rename from luci-app-adguardhome/docs/README.md rename to docs/README.md diff --git a/luci-app-adguardhome/docs/screenshots/base-en.png b/docs/screenshots/base-en.png similarity index 100% rename from luci-app-adguardhome/docs/screenshots/base-en.png rename to docs/screenshots/base-en.png diff --git a/luci-app-adguardhome/docs/screenshots/base-zh-cn.png b/docs/screenshots/base-zh-cn.png similarity index 100% rename from luci-app-adguardhome/docs/screenshots/base-zh-cn.png rename to docs/screenshots/base-zh-cn.png diff --git a/luci-app-adguardhome/docs/screenshots/log-en.png b/docs/screenshots/log-en.png similarity index 100% rename from luci-app-adguardhome/docs/screenshots/log-en.png rename to docs/screenshots/log-en.png diff --git a/luci-app-adguardhome/docs/screenshots/log-zh-cn.png b/docs/screenshots/log-zh-cn.png similarity index 100% rename from luci-app-adguardhome/docs/screenshots/log-zh-cn.png rename to docs/screenshots/log-zh-cn.png diff --git a/luci-app-adguardhome/docs/screenshots/manual-en.png b/docs/screenshots/manual-en.png similarity index 100% rename from luci-app-adguardhome/docs/screenshots/manual-en.png rename to docs/screenshots/manual-en.png diff --git a/luci-app-adguardhome/docs/screenshots/manual-zh-cn.png b/docs/screenshots/manual-zh-cn.png similarity index 100% rename from luci-app-adguardhome/docs/screenshots/manual-zh-cn.png rename to docs/screenshots/manual-zh-cn.png diff --git a/luci-app-adguardhome/.github/workflows/build-apk.yaml b/luci-app-adguardhome/.github/workflows/build-apk.yaml deleted file mode 100644 index 64b83777..00000000 --- a/luci-app-adguardhome/.github/workflows/build-apk.yaml +++ /dev/null @@ -1,70 +0,0 @@ -name: build-apk - -on: - push: - tags: - - 'v*' - - 'dev-*' - workflow_dispatch: - -permissions: - contents: write - -env: - SDK_DIR: /builder - PKG_DIR_NAME: luci-app-adguardhome-tk - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 90 - strategy: - matrix: - sdk: [x86-64-25.12.6] - container: - image: ghcr.io/openwrt/sdk:${{ matrix.sdk }} - options: --user root - defaults: - run: - shell: bash - - steps: - - name: 检出代码 - uses: actions/checkout@v7 - with: - fetch-depth: 0 - - - name: 缓存依赖源码下载 - uses: actions/cache@v5 - with: - path: ${{ env.SDK_DIR }}/dl - key: adguardhome-dl-v2-${{ runner.os }}-${{ matrix.sdk }}-${{ hashFiles('Makefile', '.github/workflows/build-apk.yaml', 'scripts/*.sh') }} - restore-keys: | - adguardhome-dl-v2-${{ runner.os }}-${{ matrix.sdk }}- - - - name: 准备 SDK - run: bash scripts/prepare-sdk.sh - - - name: 构建包 - run: runuser -u buildbot -- bash scripts/build-apk.sh - - - name: 整理 APK 产物 - run: bash scripts/collect-apks.sh - - - name: 上传 APK 压缩包 - uses: actions/upload-artifact@v7 - with: - name: adguardhome-apks - path: dist/*.apk - archive: true - if-no-files-found: error - - - name: 发布到 Releases - if: startsWith(github.ref, 'refs/tags/') - uses: softprops/action-gh-release@v3 - with: - tag_name: ${{ github.ref_name }} - prerelease: ${{ startsWith(github.ref_name, 'dev-') }} - make_latest: 'false' - fail_on_unmatched_files: true - files: dist/*.apk diff --git a/luci-app-adguardhome/.gitignore b/luci-app-adguardhome/.gitignore index 05dfba47..10d5c0e3 100644 --- a/luci-app-adguardhome/.gitignore +++ b/luci-app-adguardhome/.gitignore @@ -1,2 +1,9 @@ .DS_Store -.local \ No newline at end of file + +# Local debug artifacts from playwright-cli UI verification +adg-*.png +m-*.png +bs-*.png +*.png +!screenshots/*.png +.playwright-cli/ diff --git a/luci-app-adguardhome/Makefile b/luci-app-adguardhome/Makefile index 4eb97f6f..a3d2ffc4 100644 --- a/luci-app-adguardhome/Makefile +++ b/luci-app-adguardhome/Makefile @@ -1,109 +1,79 @@ +# Copyright (C) 2018-2024 OpenWrt luci-app-adguardhome contributors # -# Copyright (C) 2025 w9315273 +# This is free software, licensed under the Apache License, Version 2.0 . # include $(TOPDIR)/rules.mk -PKG_NAME:=luci-app-adguardhome-tk -PKG_VERSION:=2.6.0 -PKG_RELEASE:=3 +PKG_NAME:=luci-app-adguardhome +PKG_MAINTAINER:=kenzok8 +PKG_VERSION:=1.0 +PKG_RELEASE:=9 -PKG_MAINTAINER:=w9315273 -PKG_BUILD_DEPENDS:=luci-base/host +LUCI_TITLE:=LuCI app for AdGuardHome +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome +# luci-compat only exists in ucode-based LuCI (24.10+) +ifneq ($(wildcard $(TOPDIR)/feeds/luci/luci-compat/Makefile),) + LUCI_DEPENDS+= +luci-compat +endif +LUCI_DESCRIPTION:=LuCI support for AdGuardHome -include $(INCLUDE_DIR)/package.mk - -define Package/luci-app-adguardhome-tk - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI app for AdGuardHome - PKG_MAINTAINER:=https://github.com/w9315273/luci-app-adguardhome - PKGARCH:=all - PROVIDES:=luci-app-adguardhome - CONFLICTS:=luci-app-adguardhome - DEPENDS:=+luci-base +rpcd-mod-ucode +uclient-fetch +jsonfilter +flock +ca-bundle +!(PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl):libustream-mbedtls +tar +define Package/$(PKG_NAME)/config +config PACKAGE_$(PKG_NAME)_INCLUDE_binary + bool "Include Binary File" + default n + help + When enabled, also pulls in the adguardhome binary package. + Disabled by default to avoid init.d/config name conflict with + the adguardhome package (uses lowercase init.d/adguardhome, + while this LuCI app uses /etc/init.d/AdGuardHome). The LuCI + app downloads the binary at runtime, so the package dependency + is only needed for offline / sysupgrade scenarios. endef -define Package/luci-app-adguardhome-tk/description - LuCI support for AdGuardHome (nftables-based DNS redirect). - This package does NOT include the AdGuardHome core binary. -endef +PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary -define Package/luci-i18n-adguardhome-tk-zh-cn - SECTION:=luci - CATEGORY:=LuCI - HIDDEN:=1 - TITLE:=AdGuardHome - Simplified Chinese translation - PKGARCH:=all - PROVIDES:=luci-i18n-adguardhome-zh-cn - CONFLICTS:=luci-i18n-adguardhome-zh-cn - DEPENDS:=luci-app-adguardhome-tk - DEFAULT:=LUCI_LANG_zh_Hans -endef - -define Package/luci-i18n-adguardhome-tk-zh-cn/description - Simplified Chinese translation for luci-app-adguardhome-tk. -endef - -define Build/Prepare -endef - -define Build/Compile -endef - -define Package/luci-app-adguardhome-tk/conffiles +define Package/luci-app-adguardhome/conffiles +/usr/share/AdGuardHome/links.txt /etc/config/AdGuardHome endef -define Package/luci-app-adguardhome-tk/install - cp -pR ./root/* $(1)/ -endef - -define Package/luci-i18n-adguardhome-tk-zh-cn/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - echo "uci set luci.languages.zh_cn='简体中文 (Simplified Chinese)'; uci commit luci" \ - > $(1)/etc/uci-defaults/luci-i18n-adguardhome-tk-zh-cn - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - po2lmo ./po/zh-cn/AdGuardHome.po \ - $(1)/usr/lib/lua/luci/i18n/AdGuardHome.zh-cn.lmo -endef - -define Package/luci-app-adguardhome-tk/postinst +define Package/luci-app-adguardhome/postinst #!/bin/sh -[ -n "$${IPKG_INSTROOT}" ] && exit 0 - -/etc/init.d/AdGuardHome enable >/dev/null 2>&1 - -enable=$$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null) -if [ "$$enable" = "1" ]; then - /etc/init.d/AdGuardHome reload -fi - -# Remove the former menu definition when upgrading. -rm -f /usr/share/luci/menu.d/luci-app-adguardhome-js.json -rm -f /tmp/luci-indexcache /tmp/luci-indexcache.* -rm -f /tmp/luci-modulecache/* -/etc/init.d/rpcd reload - + # Stop and disable the lowercase /etc/init.d/adguardhome that ships + # with the adguardhome binary package, so it can not race the LuCI + # app's /etc/init.d/AdGuardHome (issue #254). + if [ -x /etc/init.d/adguardhome ] && [ -x /etc/init.d/AdGuardHome ]; then + /etc/init.d/adguardhome stop >/dev/null 2>&1 + /etc/init.d/adguardhome disable >/dev/null 2>&1 + fi + /etc/init.d/AdGuardHome enable >/dev/null 2>&1 + enable="$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)" + [ "$enable" = "1" ] && /etc/init.d/AdGuardHome reload >/dev/null 2>&1 + rm -f /tmp/luci-indexcache + rm -f /tmp/luci-modulecache/* 2>/dev/null exit 0 endef -define Package/luci-app-adguardhome-tk/prerm +define Package/luci-app-adguardhome/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then - /etc/init.d/AdGuardHome disable - /etc/init.d/AdGuardHome stop 2>/dev/null || true - - uci -q batch <<-EOF >/dev/null 2>&1 - delete ucitrack.@AdGuardHome[-1] - commit ucitrack -EOF + /etc/init.d/AdGuardHome disable >/dev/null 2>&1 + /etc/init.d/AdGuardHome stop >/dev/null 2>&1 + ucitrack_del() { + local name="$1" + local track="$(uci show ucitrack 2>/dev/null | grep -F "$name\." | head -1)" + [ -n "$track" ] && uci -q del "$track" 2>/dev/null + } + ucitrack_del "AdGuardHome" + [ -n "$(uci show ucitrack 2>/dev/null | grep -c 'AdGuardHome')" ] || true + uci commit ucitrack 2>/dev/null fi - exit 0 endef -$(eval $(call BuildPackage,luci-app-adguardhome-tk)) +include $(TOPDIR)/feeds/luci/luci.mk -$(eval $(call BuildPackage,luci-i18n-adguardhome-tk-zh-cn)) +# call BuildPackage - OpenWrt buildroot signature +$(eval $(call BuildPackage,luci-app-adguardhome)) diff --git a/luci-app-adguardhome/README.md b/luci-app-adguardhome/README.md new file mode 100644 index 00000000..ecdba15b --- /dev/null +++ b/luci-app-adguardhome/README.md @@ -0,0 +1,81 @@ +# luci-app-adguardhome + +适用于 OpenWrt / ImmortalWrt 的 AdGuard Home LuCI 控制面板。 + +> 基于 [rufengsuixing/luci-app-adguardhome](https://github.com/rufengsuixing/luci-app-adguardhome) 维护， +> 针对 **ImmortalWrt 24.10+** 进行了大量 UI 重构和 Bug 修复。 + +## 兼容性 + +| 系统 | 状态 | +|------|------| +| ImmortalWrt 24.10 / 25.12 | 主要测试目标，完全兼容 | +| OpenWrt 23.05 | 兼容 | +| OpenWrt 21.02 / 22.03 | 兼容 | +| OpenWrt 19.07 | 兼容（jail 字段回退为 TextValue） | +| OpenWrt 18.06 | 基本兼容（DynamicList 自动回退） | + +## 截图 + +### 概览 + +![概览](https://raw.githubusercontent.com/kenzok8/kenzok8/main/screenshot/adguardhome/01-overview.png) + +### 基础设置 + +![基础设置](https://raw.githubusercontent.com/kenzok8/kenzok8/main/screenshot/adguardhome/02-base-setting.png) + +### 运维 + +![运维](https://raw.githubusercontent.com/kenzok8/kenzok8/main/screenshot/adguardhome/03-tools.png) + +### 日志 + +![日志](https://raw.githubusercontent.com/kenzok8/kenzok8/main/screenshot/adguardhome/04-log.png) + +### 手动配置 + +![手动配置](https://raw.githubusercontent.com/kenzok8/kenzok8/main/screenshot/adguardhome/05-manual.png) + +## 功能 + +- **概览面板**：服务状态、重定向模式、核心版本、一键启停 + Web 控制台快捷入口 +- **基础设置**：启用开关、管理端口、核心更新、5553 重定向（4 种模式）、路径配置、进程参数 +- **工具与任务**：改密、sysupgrade 保留文件、关机备份、Crontab 计划任务 +- **日志查看**：实时轮询、反向/本地时区切换、下载、清空 +- **手动配置**：YAML 编辑器（CodeMirror 可选），保存前二次确认 +- **核心自动更新**：GitHub/AdGuard 多源下载 → UPX 压缩 → 重启服务 +- **UPX 压缩**：>8MB 二进制自动压缩（支持 x86_64 / arm64 / mips 等架构） +- **计划任务**：自动更新核心、切割日志、IPv6 hosts 同步 +- **升级保护**：sysupgrade 保留文件 + 关机备份 + +## 安装 + +### Feed 方式 + +```bash +echo 'src-git adguardhome https://github.com/kenzok78/luci-app-adguardhome' >> feeds.conf.default +./scripts/feeds update -a && ./scripts/feeds install -a -p adguardhome +make package/luci-app-adguardhome/compile V=s +``` + +### 直接编译 + +```bash +git clone https://github.com/kenzok78/luci-app-adguardhome.git package/luci-app-adguardhome +make menuconfig # LuCI → Applications → luci-app-adguardhome +make -j$(nproc) V=s +``` + +## 重定向模式 + +| 模式 | 说明 | +|------|------| +| 不启用 | 仅运行，不拦截 DNS | +| 作为 dnsmasq 上游 | dnsmasq 转发到 AGH | +| 53 端口劫持 | iptables 重定向到 AGH | +| 替代 dnsmasq | AGH 直接监听 53 | + +## 许可证 + +Apache-2.0 diff --git a/luci-app-adguardhome/htdocs/luci-static/resources/adguardhome/adg.css b/luci-app-adguardhome/htdocs/luci-static/resources/adguardhome/adg.css new file mode 100644 index 00000000..a6ee5020 --- /dev/null +++ b/luci-app-adguardhome/htdocs/luci-static/resources/adguardhome/adg.css @@ -0,0 +1,360 @@ +/* luci-app-adguardhome card-style theme (inspired by luci-app-clashoo) */ +.adg-wrap { + --adg-primary-rgb: 0, 122, 255; + --adg-primary: rgba(var(--adg-primary-rgb), 0.9); + --adg-card-bg: rgba(128, 128, 128, 0.04); + --adg-card-border: rgba(128, 128, 128, 0.16); + --adg-card-shadow: 0 4px 20px rgba(0, 0, 0, 0.05); + --adg-card-shadow-hover: 0 6px 24px rgba(0, 0, 0, 0.07); + --adg-radius: 12px; + --adg-label-muted: rgba(60, 66, 76, 0.85); + --adg-input-bg: rgba(128, 128, 128, 0.05); + --adg-input-border: rgba(128, 128, 128, 0.2); + --adg-ok: #2db84a; + --adg-warn: #e0a02f; + --adg-bad: #d05050; +} + +/* Dark mode: triggered either by OS preference, or by an explicit class + set from head.htm when the active LuCI theme renders a dark background + regardless of OS preference (Argon mode=dark, bootstrap-dark, etc.) */ +@media (prefers-color-scheme: dark) { + .adg-wrap { + --adg-card-bg: rgba(255, 255, 255, 0.05); + --adg-card-border: rgba(255, 255, 255, 0.16); + --adg-input-bg: rgba(255, 255, 255, 0.06); + --adg-input-border: rgba(255, 255, 255, 0.22); + --adg-label-muted: rgba(220, 226, 232, 0.88); + } +} +.adg-wrap.adg-dark { + --adg-card-bg: rgba(255, 255, 255, 0.05); + --adg-card-border: rgba(255, 255, 255, 0.16); + --adg-input-bg: rgba(255, 255, 255, 0.06); + --adg-input-border: rgba(255, 255, 255, 0.22); + --adg-label-muted: rgba(220, 226, 232, 0.88); +} +/* LuCI's selected theme is authoritative. If the OS/browser prefers dark but + Argon/bootstrap is in light mode, keep contrast tuned for a light surface. */ +.adg-wrap:not(.adg-dark) { + --adg-card-bg: rgba(255, 255, 255, 0.45); + --adg-card-border: rgba(50, 50, 93, 0.12); + --adg-input-bg: rgba(255, 255, 255, 0.55); + --adg-input-border: rgba(50, 50, 93, 0.18); + --adg-label-muted: rgba(50, 50, 93, 0.78); + color: #32325d; +} +.adg-wrap:not(.adg-dark) .cbi-value-description, +.adg-wrap:not(.adg-dark) .cbi-section-descr, +.adg-wrap:not(.adg-dark) .cbi-map-descr, +.adg-wrap:not(.adg-dark) .adg-ov-card .title, +.adg-wrap:not(.adg-dark) .adg-ov-card .sub { + color: rgba(50, 50, 93, 0.70) !important; + opacity: 1 !important; +} +.adg-wrap:not(.adg-dark) .cbi-value > .cbi-value-title, +.adg-wrap:not(.adg-dark) .cbi-checkbox { + color: rgba(50, 50, 93, 0.82) !important; + opacity: 1 !important; +} +.adg-wrap:not(.adg-dark) .cbi-value-field input[type="text"], +.adg-wrap:not(.adg-dark) .cbi-value-field input[type="password"], +.adg-wrap:not(.adg-dark) .cbi-value-field input[type="number"], +.adg-wrap:not(.adg-dark) .cbi-value-field select, +.adg-wrap:not(.adg-dark) .cbi-value-field textarea { + color: #32325d !important; + -webkit-text-fill-color: #32325d; + opacity: 1 !important; +} +.adg-wrap:not(.adg-dark) .cbi-value-field input:disabled, +.adg-wrap:not(.adg-dark) .cbi-value-field select:disabled, +.adg-wrap:not(.adg-dark) .cbi-value-field textarea:disabled { + color: #5f6f86 !important; + -webkit-text-fill-color: #5f6f86; + opacity: 1 !important; +} +/* Some Argon dark rules set transparent input bg with !important — override + so our inputs stay visible. */ +.adg-wrap.adg-dark .cbi-value-field input[type="text"], +.adg-wrap.adg-dark .cbi-value-field input[type="password"], +.adg-wrap.adg-dark .cbi-value-field input[type="number"], +.adg-wrap.adg-dark .cbi-value-field select, +.adg-wrap.adg-dark .cbi-value-field textarea { + background: var(--adg-input-bg) !important; + border-color: var(--adg-input-border) !important; + color: #e6eaf0 !important; +} +/* Help text + section descriptions — Argon paints them #ccc, bootstrap-dark + leaves them as default gray-on-dark which is also low-contrast. */ +.adg-wrap.adg-dark .cbi-value-description, +.adg-wrap.adg-dark .cbi-section-descr, +.adg-wrap.adg-dark .cbi-map-descr { + color: rgba(220, 226, 232, 0.78) !important; +} +.adg-wrap.adg-dark .cbi-value > .cbi-value-title { + color: var(--adg-label-muted) !important; +} +.adg-wrap.adg-dark .cbi-section > h3, +.adg-wrap.adg-dark .cbi-section > legend { + color: #e6eaf0 !important; +} + +/* Cards are constrained for comfortable reading; form fills its natural width. + Bootstrap theme has sidebar; Argon is full-width. Let the theme decide the + outer container width — we only cap the card content. */ +.adg-wrap .cbi-section { + max-width: 1000px; +} + +/* every CBI section becomes a card */ +.adg-wrap .cbi-section { + background: var(--adg-card-bg); + border: 1px solid var(--adg-card-border); + border-radius: var(--adg-radius); + box-shadow: var(--adg-card-shadow); + padding: 18px 22px; + margin: 16px 0; + transition: box-shadow .2s ease; +} +.adg-wrap .cbi-section:hover { + box-shadow: var(--adg-card-shadow-hover); +} + +/* section heading inside card */ +.adg-wrap .cbi-section > h3, +.adg-wrap .cbi-section > legend { + background: transparent !important; + border: 0 !important; + box-shadow: none !important; + padding: 0 0 12px 0 !important; + margin: 0 0 12px 0 !important; + font-size: 15px; + font-weight: 600; + letter-spacing: .2px; + border-bottom: 1px solid var(--adg-card-border) !important; +} + +/* label column slimmer (default LuCI is ~280px) */ +.adg-wrap .cbi-value > .cbi-value-title { + width: 170px; + min-width: 170px; + padding-right: 12px; + color: var(--adg-label-muted); + font-weight: 500; +} + +/* inputs */ +.adg-wrap .cbi-value-field input[type="text"], +.adg-wrap .cbi-value-field input[type="password"], +.adg-wrap .cbi-value-field input[type="number"], +.adg-wrap .cbi-value-field select, +.adg-wrap .cbi-value-field textarea { + background: var(--adg-input-bg); + border: 1px solid var(--adg-input-border); + border-radius: 8px; + padding: 6px 10px; + max-width: 420px; + width: 100%; + box-shadow: none; +} +.adg-wrap .cbi-value-field textarea { + max-width: 420px; + font-family: ui-monospace, SFMono-Regular, Menlo, monospace; +} +/* long-form textareas need full width (URL lists / YAML editor) */ +.adg-wrap .cbi-value-field textarea[id$="downloadlinks"], +.adg-wrap .cbi-value-field textarea[id$="escconf"], +.adg-wrap .cbi-value-field textarea#cbid\.logview\.1\.conf { + max-width: 100%; +} +.adg-wrap .cbi-value-field input:focus, +.adg-wrap .cbi-value-field select:focus, +.adg-wrap .cbi-value-field textarea:focus { + border-color: var(--adg-primary); + outline: none; + box-shadow: 0 0 0 3px rgba(var(--adg-primary-rgb), 0.15); +} + +/* help text */ +.adg-wrap .cbi-value-description { + color: var(--adg-label-muted); + font-size: 12.5px; + margin-top: 4px; +} + +/* between-row separator gone (the card itself is the boundary) */ +.adg-wrap .cbi-value { + border-bottom: 0 !important; + padding: 8px 0; +} + +/* MultiValue checkbox groups — let items flow inline and wrap naturally */ +.adg-wrap .cbi-value-field .cbi-checkbox { + display: inline-flex; + align-items: center; + gap: 4px; + margin-right: 16px; + margin-bottom: 4px; + font-size: 13px; + white-space: nowrap; +} +.adg-wrap .cbi-value-field .cbi-checkbox input[type="checkbox"] { + width: auto; + height: auto; + margin: 0; + flex-shrink: 0; +} + +/* DynamicList — compact row layout */ +.adg-wrap .cbi-dynlist .cbi-value-title { display: none; } +.adg-wrap .cbi-dynlist .cbi-value { padding: 4px 0; } +.adg-wrap .cbi-dynlist .cbi-value-field { flex: 1; max-width: 420px; } +.adg-wrap .cbi-dynlist .cbi-value-field input[type="text"] { max-width: 100%; } + +/* AdGuardHome custom status row */ +.adg-status-row { + display: flex; + flex-wrap: wrap; + gap: 10px; + margin: 6px 0 18px 0; +} +.adg-status-pill { + display: inline-flex; + align-items: center; + gap: 6px; + padding: 6px 12px; + border-radius: 999px; + background: var(--adg-card-bg); + border: 1px solid var(--adg-card-border); + font-size: 13px; + color: var(--adg-label-muted); +} +.adg-status-pill .dot { + width: 8px; + height: 8px; + border-radius: 50%; + background: var(--adg-label-muted); +} +.adg-status-pill.ok .dot { background: var(--adg-ok); } +.adg-status-pill.warn .dot { background: var(--adg-warn); } +.adg-status-pill.bad .dot { background: var(--adg-bad); } +.adg-status-pill.ok { color: var(--adg-ok); border-color: rgba(45,184,74,.3); } +.adg-status-pill.bad { color: var(--adg-bad); border-color: rgba(208,80,80,.3); } + +/* CBI button color fallback — ensure visibility on themes that use + transparent backgrounds (e.g. Argon light) */ +.adg-wrap input.cbi-button-apply, +.adg-wrap button.cbi-button-apply { + background: #007aff !important; + border-color: #007aff !important; + color: #fff !important; +} +.adg-wrap input.cbi-button-apply:hover, +.adg-wrap button.cbi-button-apply:hover { + background: #0064d2 !important; + border-color: #0064d2 !important; +} +.adg-wrap input.cbi-button-remove, +.adg-wrap button.cbi-button-remove { + background: #d05050 !important; + border-color: #d05050 !important; + color: #fff !important; +} +.adg-wrap input.cbi-button-remove:hover, +.adg-wrap button.cbi-button-remove:hover { + background: #b03d3d !important; + border-color: #b03d3d !important; +} +.adg-wrap input.cbi-button-save, +.adg-wrap button.cbi-button-save { + background: #2d7d46 !important; + border-color: #2d7d46 !important; + color: #fff !important; +} +.adg-wrap input.cbi-button-save:hover, +.adg-wrap button.cbi-button-save:hover { + background: #226434 !important; + border-color: #226434 !important; +} + +/* collapsible sections */ +.adg-wrap .cbi-section.adg-collapsible > h3, +.adg-wrap .cbi-section.adg-collapsible > legend { + cursor: pointer; + position: relative; + padding-right: 28px !important; + user-select: none; +} +.adg-wrap .cbi-section.adg-collapsible > h3::after, +.adg-wrap .cbi-section.adg-collapsible > legend::after { + content: ""; + position: absolute; + right: 4px; + top: 50%; + width: 8px; + height: 8px; + border-right: 2px solid var(--adg-label-muted); + border-bottom: 2px solid var(--adg-label-muted); + transform: translateY(-65%) rotate(45deg); + transition: transform .2s ease; +} +.adg-wrap .cbi-section.adg-collapsible.adg-collapsed > h3::after, +.adg-wrap .cbi-section.adg-collapsible.adg-collapsed > legend::after { + transform: translateY(-30%) rotate(-45deg); +} +.adg-wrap .cbi-section.adg-collapsible.adg-collapsed > .cbi-value, +.adg-wrap .cbi-section.adg-collapsible.adg-collapsed > div.cbi-section-node, +.adg-wrap .cbi-section.adg-collapsible.adg-collapsed > fieldset { + display: none; +} + +/* mobile tweaks — reset table/flex layout entirely */ +@media (max-width: 720px) { + .adg-wrap .cbi-section { + padding: 12px 10px; + margin: 8px 0; + } + /* force flex column, kill any theme table layout */ + .adg-wrap .cbi-value { + display: flex !important; + flex-direction: column; + align-items: stretch; + border-bottom: 0 !important; + padding: 6px 0; + } + .adg-wrap .cbi-value > .cbi-value-title { + width: 100% !important; + min-width: 0 !important; + padding: 0 0 3px 0 !important; + flex: none; + text-align: left; + } + .adg-wrap .cbi-value > .cbi-value-field { + width: 100% !important; + flex: none; + } + .adg-wrap .cbi-value-field input[type="text"], + .adg-wrap .cbi-value-field input[type="password"], + .adg-wrap .cbi-value-field input[type="number"], + .adg-wrap .cbi-value-field select { + max-width: 100%; + } + .adg-wrap .cbi-value-field > div { + width: 100%; + } + /* checkboxes — single column */ + .adg-wrap .cbi-value-field .cbi-checkbox { + display: flex; + white-space: normal; + margin-right: 0; + margin-bottom: 6px; + width: 100%; + } + /* DynamicList — expand */ + .adg-wrap .cbi-dynlist .cbi-value-field { max-width: 100%; } + /* hide tooltips on touch */ + .adg-wrap .cbi-tooltip-container, + .adg-wrap .cbi-tooltip { + display: none !important; + } +} diff --git a/luci-app-adguardhome/htdocs/luci-static/resources/view/luci-app-adguardhome/index.js b/luci-app-adguardhome/htdocs/luci-static/resources/view/luci-app-adguardhome/index.js new file mode 100644 index 00000000..e483ee42 --- /dev/null +++ b/luci-app-adguardhome/htdocs/luci-static/resources/view/luci-app-adguardhome/index.js @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: Apache-2.0 +// NOTE: luci-app-adguardhome 使用多页面 CBI 模板架构，luci 23.05+ 通过 menu.d alias 跳转至 base 子页。 +// 此 JS 文件不直接调用，保留供参考。 +'use strict'; +'require view'; +'require rpc'; +'require form'; + +return view.extend({ + render: function() { + // 实际界面由 luasrc/model/cbi/AdGuardHome/ 下多个 CBI 模型提供 + return E('p', {}, _('Loading…')); + } +}); diff --git a/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua b/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua new file mode 100644 index 00000000..658f34c0 --- /dev/null +++ b/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua @@ -0,0 +1,274 @@ +module("luci.controller.AdGuardHome", package.seeall) + +local fs = require "nixio.fs" +local http = require "luci.http" +local uci = require "luci.model.uci".cursor() + +local function service_running() + local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath") or "/usr/bin/AdGuardHome" + + if not fs.access(binpath) then + return false + end + + return luci.sys.call("/etc/init.d/AdGuardHome status >/dev/null 2>&1") == 0 +end + +function index() + -- luci 23.05+ 已通过 menu.d JSON 注册菜单，无需重复注册 + if not nixio.fs.access("/usr/share/luci/menu.d/luci-app-adguardhome.json") then + local page = entry({"admin", "services", "AdGuardHome"}, + alias("admin", "services", "AdGuardHome", "overview"), + _("AdGuard Home"), 10) + page.dependent = true + page.acl_depends = { "luci-app-adguardhome" } + + entry({"admin", "services", "AdGuardHome", "overview"}, + cbi("AdGuardHome/overview"), _("概览"), 1).leaf = true + entry({"admin", "services", "AdGuardHome", "base"}, + cbi("AdGuardHome/base"), _("基础设置"), 2).leaf = true + entry({"admin", "services", "AdGuardHome", "tools"}, + cbi("AdGuardHome/tools"), _("运维"), 3).leaf = true + entry({"admin", "services", "AdGuardHome", "log"}, + form("AdGuardHome/log"), _("日志"), 4).leaf = true + entry({"admin", "services", "AdGuardHome", "manual"}, + cbi("AdGuardHome/manual"), _("手动配置"), 5).leaf = true + end + + -- API 路由在新旧版本均需注册 + entry({"admin", "services", "AdGuardHome", "status"}, + call("act_status"), nil).leaf = true + entry({"admin", "services", "AdGuardHome", "toggle"}, + call("toggle_service"), nil).leaf = true + entry({"admin", "services", "AdGuardHome", "check"}, + call("check_update"), nil) + entry({"admin", "services", "AdGuardHome", "doupdate"}, + call("do_update"), nil) + entry({"admin", "services", "AdGuardHome", "getlog"}, + call("get_log"), nil) + entry({"admin", "services", "AdGuardHome", "dodellog"}, + call("do_dellog"), nil) + entry({"admin", "services", "AdGuardHome", "reloadconfig"}, + call("reload_config"), nil) + entry({"admin", "services", "AdGuardHome", "gettemplateconfig"}, + call("get_template_config"), nil) +end + +local function gen_template_config() + local dns_servers = "" + local resolv_auto = "/tmp/resolv.conf.d/resolv.conf.auto" + if fs.access(resolv_auto) then + for line in io.lines(resolv_auto) do + local ns = line:match("^[^#]*nameserver%s+([^%s]+)") + if ns then + dns_servers = dns_servers .. " - " .. ns .. "\n" + end + end + end + + local tmpl = "/usr/share/AdGuardHome/AdGuardHome_template.yaml" + local f = io.open(tmpl, "r") + if not f then return "" end + + local lines = {} + for line in f:lines() do + if line == "#bootstrap_dns" then + table.insert(lines, dns_servers) + elseif line == "#upstream_dns" then + table.insert(lines, dns_servers) + else + table.insert(lines, line) + end + end + f:close() + return table.concat(lines, "\n") +end + +function get_template_config() + http.prepare_content("text/plain; charset=utf-8") + http.write(gen_template_config()) +end + +function reload_config() + fs.remove("/tmp/AdGuardHometmpconfig.yaml") + http.prepare_content("application/json") + http.write('{}') +end + +function act_status() + local result = {} + result.running = service_running() + + local redir = fs.readfile("/var/run/AdGredir") + result.redirect = (redir == "1") + + http.prepare_content("application/json") + http.write_json(result) +end + +function toggle_service() + local enabled = http.formvalue("enabled") == "1" and "1" or "0" + local old_enabled = uci:get("AdGuardHome", "AdGuardHome", "enabled") == "1" and "1" or "0" + local result = { + enabled = (enabled == "1") + } + + -- Preflight: when enabling, make sure the binary is actually present. + -- Without this, init.d reload silently fails and the UI only sees an + -- opaque "Operation failed" toast (issue #254). + if enabled == "1" then + local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath") or "/usr/bin/AdGuardHome" + if not fs.access(binpath) then + result.success = false + result.enabled = (old_enabled == "1") + result.running = false + result.message = "找不到 AdGuardHome 二进制文件（" .. binpath .. + "），请先在「运维」页面下载。" + http.prepare_content("application/json") + http.write_json(result) + return + end + end + + uci:set("AdGuardHome", "AdGuardHome", "enabled", enabled) + uci:commit("AdGuardHome") + + local rc + if enabled == "1" then + -- Detach the reload from the CGI request so the HTTP call returns + -- immediately while the daemon comes up. Fully redirecting fds + `&` + -- is enough — avoid start-stop-daemon, whose busybox applet is not + -- enabled on some images (e.g. immortalwrt 25.10), where it would + -- exit 127 and make the toggle wrongly report a start failure (#254). + rc = luci.sys.call("/etc/init.d/AdGuardHome reload >/dev/null 2>&1 &") + else + rc = luci.sys.call("/etc/init.d/AdGuardHome stop >/dev/null 2>&1") + end + + if enabled == "1" then + result.running = false + else + result.running = service_running() + for _ = 1, 2 do + if not result.running then + break + end + luci.sys.call("sleep 1") + result.running = service_running() + end + end + + result.pending = (enabled == "1" and not result.running) + result.success = (rc == 0) and (enabled == "1" or not result.running) + + if not result.success then + uci:set("AdGuardHome", "AdGuardHome", "enabled", old_enabled) + uci:commit("AdGuardHome") + result.enabled = (old_enabled == "1") + result.message = enabled == "1" and "AdGuardHome start failed" or "AdGuardHome stop failed" + end + + http.prepare_content("application/json") + http.write_json(result) +end + +function do_update() + fs.writefile("/var/run/lucilogpos", "0") + http.prepare_content("application/json") + http.write('{}') + + local arg = "" + if luci.http.formvalue("force") == "1" then + arg = "force" + end + + local script = "/usr/share/AdGuardHome/update_core.sh" + if fs.access("/var/run/update_core") then + if arg == "force" then + -- Security fix: script 路径是固定常量，arg 只能是 "force" 或 ""，无注入风险 + luci.sys.exec("pkill -f '" .. script .. "' 2>/dev/null; " .. script .. " " .. arg .. " >/tmp/AdGuardHome_update.log 2>&1 &") + end + else + luci.sys.exec(script .. " " .. arg .. " >/tmp/AdGuardHome_update.log 2>&1 &") + end +end + +function get_log() + local logfile = uci:get("AdGuardHome", "AdGuardHome", "logfile") + + if not logfile or logfile == "" then + http.write("no log available\n") + return + end + + if logfile == "syslog" then + if not fs.access("/var/run/AdGuardHomesyslog") then + luci.sys.exec("(/usr/share/AdGuardHome/getsyslog.sh &); sleep 1;") + end + logfile = "/tmp/AdGuardHometmp.log" + fs.writefile("/var/run/AdGuardHomesyslog", "1") + elseif not fs.access(logfile) then + http.write("") + return + end + + http.prepare_content("text/plain; charset=utf-8") + + local fdp = 0 + if fs.access("/var/run/lucilogreload") then + fdp = 0 + fs.remove("/var/run/lucilogreload") + else + local pos = fs.readfile("/var/run/lucilogpos") + fdp = tonumber(pos) or 0 + end + + local f = io.open(logfile, "r") + if not f then + http.write("") + return + end + + f:seek("set", fdp) + local content = f:read(2048000) or "" + fdp = f:seek() + f:close() + + fs.writefile("/var/run/lucilogpos", tostring(fdp)) + http.write(content) +end + +function do_dellog() + local logfile = uci:get("AdGuardHome", "AdGuardHome", "logfile") + if logfile and logfile ~= "" and logfile ~= "syslog" then + fs.writefile(logfile, "") + end + http.prepare_content("application/json") + http.write('{}') +end + +function check_update() + http.prepare_content("text/plain; charset=utf-8") + + local pos = fs.readfile("/var/run/lucilogpos") + local fdp = tonumber(pos) or 0 + + local f = io.open("/tmp/AdGuardHome_update.log", "r") + if not f then + http.write("") + return + end + + f:seek("set", fdp) + local content = f:read(2048000) or "" + fdp = f:seek() + f:close() + + fs.writefile("/var/run/lucilogpos", tostring(fdp)) + + if fs.access("/var/run/update_core") then + http.write(content) + else + http.write(content .. "\0") + end +end diff --git a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua new file mode 100644 index 00000000..961201a2 --- /dev/null +++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua @@ -0,0 +1,244 @@ +require("luci.sys") +require("luci.util") +require("io") + +local m, s, o, o1 +local fs = require "nixio.fs" +local uci = require "luci.model.uci".cursor() + +local configpath = uci:get("AdGuardHome", "AdGuardHome", "configpath") or "/etc/AdGuardHome.yaml" +local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath") or "/usr/bin/AdGuardHome" +local httpport = uci:get("AdGuardHome", "AdGuardHome", "httpport") or "3000" + +local function service_running() + if not fs.access(binpath) then + return false + end + return luci.sys.call("/etc/init.d/AdGuardHome status >/dev/null 2>&1") == 0 +end + +m = Map("AdGuardHome", "AdGuard Home") +m.description = translate("Free and open source, powerful network-wide ads & trackers blocking DNS server.") + +-- Inject card-style CSS for AGH pages + + +-- ============================================================ +-- Section 1: Basic Settings +-- ============================================================ +s = m:section(NamedSection, "AdGuardHome", "AdGuardHome", "基本设置") + +o = s:option(Flag, "enabled", translate("Enable")) +o.default = "0" +o.optional = false +o.template = "AdGuardHome/enable_switch" +o.cfgvalue = function() + return service_running() and "1" or "0" +end + +o = s:option(Value, "httpport", translate("Browser management port")) +o.placeholder = "3000" +o.default = "3000" +o.datatype = "port" +o.optional = false + +o = s:option(Button, "restart", translate("Update")) +o.inputtitle = translate("Update core version") +o.template = "AdGuardHome/AdGuardHome_check" +o.showfastconfig = not fs.access(configpath) + +o = s:option(ListValue, "release_channel", translate("更新通道"), + translate("正式版稳定；预发布版抢先体验 AdGuard 团队 beta 构建。")) +o:value("stable", translate("正式版 (stable)")) +o:value("beta", translate("预发布版 (beta)")) +o.default = "stable" +o.rmempty = false + +local port = luci.sys.exec("awk '/^ port:/{print $2;exit}' " .. configpath .. " 2>/dev/null") +if not port or port == "" then + port = "?" +end + +o = s:option(ListValue, "redirect", port .. translate("Redirect"), translate("AdGuardHome redirect mode")) +o:value("none", translate("不启用")) +o:value("dnsmasq-upstream", translate("作为 dnsmasq 上游服务器")) +o:value("redirect", translate("将 53 端口劫持到 AdGuardHome")) +o:value("exchange", translate("使用 53 端口替代 dnsmasq")) +o.default = "none" +o.optional = true + +-- ============================================================ +-- Section 2: Paths & Logs +-- ============================================================ +s = m:section(NamedSection, "AdGuardHome", "AdGuardHome", "路径与日志") + +o = s:option(Value, "binpath", translate("Bin Path"), translate("AdGuardHome Bin path if no bin will auto download")) +o.default = "/usr/bin/AdGuardHome" +o.datatype = "string" +o.optional = false +o.rmempty = false +o.validate = function(self, value) + if value == "" then return nil end + if fs.stat(value, "type") == "dir" then + fs.rmdir(value) + end + if fs.stat(value, "type") == "dir" then + m.message = (m.message or "") .. "\n" .. translate("Error: bin path is a directory") + return nil + end + return value +end + +o = s:option(Value, "configpath", translate("Config Path"), translate("AdGuardHome config path")) +o.default = "/etc/AdGuardHome.yaml" +o.datatype = "string" +o.optional = false +o.rmempty = false +o.validate = function(self, value) + if not value then return nil end + if fs.stat(value, "type") == "dir" then + fs.rmdir(value) + end + if fs.stat(value, "type") == "dir" then + m.message = (m.message or "") .. "\n" .. translate("Error: config path is a directory") + return nil + end + return value +end + +o = s:option(Value, "workdir", translate("Work dir"), translate("AdGuardHome work dir include rules,audit log and database")) +o.default = "/etc/AdGuardHome" +o.datatype = "string" +o.optional = false +o.rmempty = false +o.validate = function(self, value) + if value == "" then return nil end + if fs.stat(value, "type") == "reg" then + m.message = (m.message or "") .. "\n" .. translate("Error: work dir is a file") + return nil + end + if value:sub(-1) == "/" then + return value:sub(1, -2) + end + return value +end + +o = s:option(Value, "logfile", translate("Runtime log file"), translate("AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log")) +o.datatype = "string" +o.rmempty = true +o.validate = function(self, value) + if value and value ~= "" and fs.stat(value, "type") == "dir" then + fs.rmdir(value) + end + if value and value ~= "" and fs.stat(value, "type") == "dir" then + m.message = (m.message or "") .. "\n" .. translate("Error: log file is a directory") + return nil + end + return value +end + +o = s:option(Flag, "verbose", translate("Verbose log")) +o.default = "0" +o.optional = true + +-- ============================================================ +-- Section 3: Advanced Settings +-- ============================================================ +s = m:section(NamedSection, "AdGuardHome", "AdGuardHome", "高级设置") + +o = s:option(ListValue, "upxflag", translate("use upx to compress bin after download")) +o:value("", translate("none")) +o:value("-1", translate("compress faster")) +o:value("-9", translate("compress better")) +o:value("--best", translate("compress best(can be slow for big files)")) +o:value("--brute", translate("try all available compression methods & filters [slow]")) +o:value("--ultra-brute", translate("try even more compression variants [very slow]")) +o.default = "" +o.description = translate("bin use less space,but may have compatibility issues") +o.rmempty = true + +o = s:option(Value, "user", translate("Service user"), translate("User the service runs under. If empty, defaults to 'adguardhome'.")) +o.placeholder = "adguardhome" +o.datatype = "string" +o.rmempty = true + +o = s:option(Value, "group", translate("Service group"), translate("Group the service runs under. If empty, defaults to 'adguardhome'.")) +o.placeholder = "adguardhome" +o.datatype = "string" +o.rmempty = true + +-- Helper：兼容把旧的 newline-separated 字符串读成 table（仅一次性迁移期需要） +local function split_legacy_list(value) + if type(value) ~= "string" or value == "" then return value end + if not value:find("[\r\n]") then return value end + local t = {} + for line in value:gmatch("[^\r\n]+") do + line = line:match("^%s*(.-)%s*$") + if line ~= "" then t[#t+1] = line end + end + return t +end + +o = s:option(DynamicList, "jail_mount", translate("只读文件访问"), + translate("AdGuardHome 可以读取的目录或文件路径，每行一项。")) +o.placeholder = "/etc/hosts" +o.rmempty = true +o.cfgvalue = function(self, section) + return split_legacy_list(uci:get("AdGuardHome", section, "jail_mount")) +end + +o = s:option(DynamicList, "jail_mount_rw", translate("读写文件访问"), + translate("AdGuardHome 可以读写的目录或文件路径，每行一项。")) +o.placeholder = "/var/log/AdGuardHome" +o.rmempty = true +o.cfgvalue = function(self, section) + return split_legacy_list(uci:get("AdGuardHome", section, "jail_mount_rw")) +end + +-- Probe system memory to suggest a sane MiB cap (≈50% of total RAM) +local total_mem_kb = tonumber(luci.sys.exec("awk '/MemTotal/{print $2}' /proc/meminfo 2>/dev/null")) or 0 +local mem_suggest_mib = (total_mem_kb > 0) and math.floor(total_mem_kb / 1024 / 2) or 128 + +o = s:option(Value, "memlimit", translate("内存上限 (MiB)"), + translate("达到阈值时主动触发 GC，避免被系统 OOM 杀进程。留空 = 不限制。建议设为系统内存的 50%。")) +o.datatype = "uinteger" +o.placeholder = translate("推荐 ") .. tostring(mem_suggest_mib) +o.rmempty = true + +o = s:option(Flag, "waitonboot", translate("On boot when network ok restart")) +o.default = "1" +o.rmempty = true + +-- ============================================================ +-- Commit handler +-- ============================================================ +fs.writefile("/var/run/lucilogpos", "0") + +function m.on_commit(map) + if fs.access("/var/run/AdGserverdis") then + io.popen("/etc/init.d/AdGuardHome reload &") + return + end + + local ucitracktest = uci:get("AdGuardHome", "AdGuardHome", "ucitracktest") + if ucitracktest == "1" then + return + elseif ucitracktest == "0" then + io.popen("/etc/init.d/AdGuardHome reload &") + else + if fs.access("/var/run/AdGlucitest") then + uci:set("AdGuardHome", "AdGuardHome", "ucitracktest", "0") + io.popen("/etc/init.d/AdGuardHome reload &") + else + fs.writefile("/var/run/AdGlucitest", "") + if ucitracktest == "2" then + uci:set("AdGuardHome", "AdGuardHome", "ucitracktest", "1") + else + uci:set("AdGuardHome", "AdGuardHome", "ucitracktest", "2") + end + end + uci:save("AdGuardHome") + end +end + +return m diff --git a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua new file mode 100644 index 00000000..5d18a88d --- /dev/null +++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua @@ -0,0 +1,16 @@ +local fs=require"nixio.fs" +local uci=require"luci.model.uci".cursor() +local f,t +f=SimpleForm("logview") +f.reset = false +f.submit = false +t=f:field(TextValue,"conf") +t.rmempty=true +t.rows=20 +t.template="AdGuardHome/log" +t.readonly="readonly" +local logfile=uci:get("AdGuardHome","AdGuardHome","logfile") or "" +t.timereplace=(logfile~="syslog" and logfile~="" ) +t.pollcheck=logfile~="" +fs.writefile("/var/run/lucilogreload","") +return f diff --git a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua new file mode 100644 index 00000000..d7bf82e9 --- /dev/null +++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua @@ -0,0 +1,121 @@ +local m, s, o +local fs = require "nixio.fs" +local uci = require "luci.model.uci".cursor() +local sys = require "luci.sys" +require("string") +require("io") +require("table") + +m = Map("AdGuardHome") + + + +local configpath = uci:get("AdGuardHome", "AdGuardHome", "configpath") or "/etc/AdGuardHome.yaml" +local binpath = uci:get("AdGuardHome", "AdGuardHome", "binpath") or "/usr/bin/AdGuardHome" + +s = m:section(TypedSection, "AdGuardHome") +s.anonymous = true +s.addremove = false + +o = s:option(TextValue, "escconf") +o.rows = 66 +o.wrap = "off" +o.rmempty = true + +o.cfgvalue = function(self, section) + local tmp = fs.readfile("/tmp/AdGuardHometmpconfig.yaml") + if tmp then return tmp end + + local cfg = fs.readfile(configpath) + if cfg then return cfg end + + local dns_servers = "" + local resolv_auto = "/tmp/resolv.conf.d/resolv.conf.auto" + if fs.access(resolv_auto) then + for line in io.lines(resolv_auto) do + local ns = line:match("^[^#]*nameserver%s+([^%s]+)") + if ns then + dns_servers = dns_servers .. " - " .. ns .. "\n" + end + end + end + + local tmpl = "/usr/share/AdGuardHome/AdGuardHome_template.yaml" + local f = io.open(tmpl, "r") + if not f then return "" end + + local lines = {} + for line in f:lines() do + if line == "#bootstrap_dns" then + table.insert(lines, dns_servers) + elseif line == "#upstream_dns" then + table.insert(lines, dns_servers) + else + table.insert(lines, line) + end + end + f:close() + return table.concat(lines, "\n") +end + +o.validate = function(self, value) + if not value then return nil end + fs.writefile("/tmp/AdGuardHometmpconfig.yaml", value:gsub("\r\n", "\n")) + + if fs.access(binpath) then + local ret = sys.call(binpath .. " -c /tmp/AdGuardHometmpconfig.yaml --check-config 2>/tmp/AdGuardHometest.log") + if ret == 0 then + return value + end + else + return value + end + + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "AdGuardHome", "manual")) + return nil +end + +o.write = function(self, section, value) + if fs.access("/tmp/AdGuardHometmpconfig.yaml") then + fs.move("/tmp/AdGuardHometmpconfig.yaml", configpath) + end +end + +o.remove = function(self, section, value) + fs.writefile(configpath, "") +end + +o = s:option(DummyValue, "") +o.anonymous = true +o.template = "AdGuardHome/yamleditor" + +if not fs.access(binpath) then + o.description = translate("WARNING: no binary found, config validation will be skipped") +end + +if fs.access("/tmp/AdGuardHometest.log") then + local errlog = fs.readfile("/tmp/AdGuardHometest.log") + if errlog and errlog ~= "" then + o = s:option(TextValue, "") + o.readonly = true + o.rows = 5 + o.rmempty = true + o.name = "" + o.cfgvalue = function(self, section) + return fs.readfile("/tmp/AdGuardHometest.log") + end + end +end + +function m.on_commit(map) + local ucitracktest = uci:get("AdGuardHome", "AdGuardHome", "ucitracktest") + if ucitracktest == "1" then + return + elseif ucitracktest == "0" then + io.popen("/etc/init.d/AdGuardHome reload &") + else + fs.writefile("/var/run/AdGlucitest", "") + end +end + +return m diff --git a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/overview.lua b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/overview.lua new file mode 100644 index 00000000..4ece44fd --- /dev/null +++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/overview.lua @@ -0,0 +1,16 @@ +require("luci.sys") + +local m, s +local fs = require "nixio.fs" +local uci = require "luci.model.uci".cursor() + +m = Map("AdGuardHome") + +m:section(SimpleSection).template = "AdGuardHome/overview" + +-- Read-only dashboard — hide form submit / reset buttons +m.submit = false +m.reset = false +m.apply_on_parse = false + +return m diff --git a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/tools.lua b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/tools.lua new file mode 100644 index 00000000..55a520b0 --- /dev/null +++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/tools.lua @@ -0,0 +1,113 @@ +require("luci.sys") +require("luci.util") + +local m, s, o, o1 +local fs = require "nixio.fs" +local uci = require "luci.model.uci".cursor() + +local workdir = uci:get("AdGuardHome", "AdGuardHome", "workdir") or "/etc/AdGuardHome" + +m = Map("AdGuardHome", translate("运维")) +m.description = translate("改密、备份、计划任务、下载源") + + + +s = m:section(NamedSection, "AdGuardHome", "AdGuardHome", "") +s.anonymous = true +s.addremove = false + +-- Change password ------------------------------------------------ +o = s:option(Value, "hashpass", translate("Change browser management password"), + translate("Press load culculate model and culculate finally save/apply")) +o.default = "" +o.datatype = "string" +o.template = "AdGuardHome/AdGuardHome_chpass" +o.rmempty = true + +-- Upgrade keep files --------------------------------------------- +o = s:option(MultiValue, "upprotect", translate("Keep files when system upgrade"), + translate("刷固件 (sysupgrade) 时保留这些文件。普通用户按推荐勾选即可：核心 + 配置 + filters + sessions.db + stats.db。日志和 querylog 通常不需要保留（querylog 可能占数十 MB）。")) +o:value("$binpath", translate("核心执行文件 (推荐)")) +o:value("$configpath", translate("配置文件 (必选)")) +o:value("$logfile", translate("日志文件")) +o:value("$workdir/data/sessions.db", translate("登录会话 sessions.db (推荐)")) +o:value("$workdir/data/stats.db", translate("统计 stats.db (推荐)")) +o:value("$workdir/data/querylog.json", translate("查询日志 querylog.json (占空间)")) +o:value("$workdir/data/filters", translate("过滤规则 filters (推荐)")) +o.widget = "checkbox" +o.default = "$binpath $configpath $workdir/data/sessions.db $workdir/data/stats.db $workdir/data/filters" +o.optional = false + +-- Backup workdir ------------------------------------------------- +o = s:option(MultiValue, "backupfile", translate("Backup workdir files when shutdown"), + translate("关机时把这些文件复制到下方「备份工作目录路径」，下次开机如果 workdir/data 为空会自动恢复。仅当工作目录位于 tmpfs（如 /tmp）时才需要勾选，持久化路径无需备份。")) +o1 = s:option(Value, "backupwdpath", translate("Backup workdir path")) + +o:value("filters", "filters") +o:value("stats.db", "stats.db") +o:value("querylog.json", "querylog.json") +o:value("sessions.db", "sessions.db") +o1:depends("backupfile", "filters") +o1:depends("backupfile", "stats.db") +o1:depends("backupfile", "querylog.json") +o1:depends("backupfile", "sessions.db") + +if fs.access(workdir .. "/data") then + for name in fs.glob(workdir .. "/data/*") do + local basename = fs.basename(name) + if basename ~= "filters" and basename ~= "stats.db" + and basename ~= "querylog.json" and basename ~= "sessions.db" then + o:value(basename, basename) + o1:depends("backupfile", basename) + end + end +end + +o.widget = "checkbox" +o.default = nil +o.optional = false +o.description = translate("Will be restore when workdir/data is empty") + +o1.default = "/etc/AdGuardHome" +o1.datatype = "string" +o1.optional = false +o1.validate = function(self, value) + if value and value ~= "" and fs.stat(value, "type") == "reg" then + m.message = (m.message or "") .. "\n" .. translate("Error: backup dir is a file") + return nil + end + if value and value:sub(-1) == "/" then + return value:sub(1, -2) + end + return value +end + +-- Crontab tasks -------------------------------------------------- +o = s:option(MultiValue, "crontab", translate("Crontab task"), + translate("Please change time and args in crontab")) +o:value("autoupdate", translate("Auto update core")) +o:value("cutquerylog", translate("Auto tail querylog")) +o:value("cutruntimelog", translate("Auto tail runtime log")) +o:value("autohost", translate("Auto update ipv6 hosts and restart adh")) +o.widget = "checkbox" +o.default = nil +o.optional = false + +-- Download links ------------------------------------------------- +o = s:option(TextValue, "downloadlinks", translate("Download links for update")) +o.optional = false +o.rows = 4 +o.wrap = "soft" +o.cfgvalue = function(self, section) + if fs.access("/usr/share/AdGuardHome/links.txt") then + return fs.readfile("/usr/share/AdGuardHome/links.txt") + end + return "" +end +o.write = function(self, section, value) + if value then + fs.writefile("/usr/share/AdGuardHome/links.txt", value:gsub("\r\n", "\n")) + end +end + +return m diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm new file mode 100644 index 00000000..251374b0 Binary files /dev/null and b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm differ diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm new file mode 100644 index 00000000..1c274fbf --- /dev/null +++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm @@ -0,0 +1,51 @@ +<%+AdGuardHome/head%> +<%+cbi/valueheader%> + +
+ 0, "data-choices", { self.keylist, self.vallist }) + %> /> + <% if self.password then %><% end %> + + +
+ +<%+cbi/valuefooter%> diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm new file mode 100644 index 00000000..b0e8bb36 --- /dev/null +++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm @@ -0,0 +1,145 @@ + + +
+
+
+ <%:Collecting data...%> +
+
+
diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/enable_switch.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/enable_switch.htm new file mode 100644 index 00000000..96ff2b4d --- /dev/null +++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/enable_switch.htm @@ -0,0 +1,169 @@ +<%+AdGuardHome/head%> +<%+cbi/valueheader%> +<% + local value = self:cfgvalue(section) + local checked = value == "1" + local field_id = cbid +%> + +
+ /> + + > +
+ +<%+cbi/valuefooter%> diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/head.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/head.htm new file mode 100644 index 00000000..583a5ae5 --- /dev/null +++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/head.htm @@ -0,0 +1,83 @@ + diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm new file mode 100644 index 00000000..e38d8015 --- /dev/null +++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm @@ -0,0 +1,186 @@ +<%+cbi/valueheader%> +<%+AdGuardHome/head%> +<%+AdGuardHome/log_empty%> + +
+ + <%if self.timereplace then%> + + <%end%> +
+

+

+	
+	
+

+
+<%+cbi/valuefooter%>
diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/log_empty.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/log_empty.htm
new file mode 100644
index 00000000..a818b741
--- /dev/null
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/log_empty.htm
@@ -0,0 +1,27 @@
+<%
+local fs = require "nixio.fs"
+local uci = require "luci.model.uci".cursor()
+
+local logfile = uci:get("AdGuardHome", "AdGuardHome", "logfile") or ""
+local no_logfile = (logfile == "")
+%>
+
+<% if no_logfile then %>
+

+	
!

+	

+		
<%:运行日志未配置%>

+		
<%:请在「基础设置 → 路径与日志 → 运行日志」填入日志路径（如 /tmp/AdGuardHome.log），或填 syslog 写入系统日志。%>

+		<%:去设置%>
+	

+

+
+<% end %>
diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/overview.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/overview.htm
new file mode 100644
index 00000000..a70c4333
--- /dev/null
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/overview.htm
@@ -0,0 +1,286 @@
+<%+AdGuardHome/head%>
+<%
+local fs  = require "nixio.fs"
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local dsp = require "luci.dispatcher"
+
+local binpath    = uci:get("AdGuardHome", "AdGuardHome", "binpath")    or "/usr/bin/AdGuardHome"
+local configpath = uci:get("AdGuardHome", "AdGuardHome", "configpath") or "/etc/AdGuardHome.yaml"
+local httpport   = uci:get("AdGuardHome", "AdGuardHome", "httpport")   or "3000"
+local redirect   = uci:get("AdGuardHome", "AdGuardHome", "redirect")   or "none"
+local version    = uci:get("AdGuardHome", "AdGuardHome", "version")    or "-"
+
+local has_bin    = fs.access(binpath)
+local has_config = fs.access(configpath)
+
+local toggle_url = dsp.build_url("admin", "services", "AdGuardHome", "toggle")
+local base_url   = dsp.build_url("admin", "services", "AdGuardHome", "base")
+local tools_url  = dsp.build_url("admin", "services", "AdGuardHome", "tools")
+local log_url    = dsp.build_url("admin", "services", "AdGuardHome", "log")
+
+local redirect_label = {
+	none               = translate("未启用"),
+	["dnsmasq-upstream"] = translate("作为 dnsmasq 上游"),
+	redirect           = translate("53 端口劫持"),
+	exchange           = translate("替代 dnsmasq")
+}
+local redirect_text = redirect_label[redirect] or redirect
+%>
+
+
+
+

+	
+	

+		
+		

+			

+				

+					
<%:服务状态%>

+					

+						<%:正在检测…%>
+					

+				

+				
+			

+			
 

+		

+
+		
+		

+			
<%:重定向模式%>

+			

+				<%= redirect_text %>
+			

+			

+				<%:配置「基础设置 → 5553 重定向」%>
+			

+		

+
+		
+		

+			
<%:核心版本%>

+			

+				<% if has_bin then %>
+					<%= version %>
+				<% else %>
+					<%:未安装%>
+				<% end %>
+			

+			

+				<% if not has_config then %>
+					<%:配置文件缺失%>
+				<% elseif not has_bin then %>
+					<%:点击「基础设置 → 更新核心版本」下载%>
+				<% else %>
+					<%= binpath %>
+				<% end %>
+			

+		

+	

+
+	
+	

+		
+			<%:打开 Web 控制台%> :<%=httpport%>
+		
+		<%:基础设置%>
+		<%:运维%>
+		<%:查看日志%>
+	

+

+
+
diff --git a/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm b/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
new file mode 100644
index 00000000..2ecdbd0a
--- /dev/null
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
@@ -0,0 +1,84 @@
+<%+AdGuardHome/head%>
+<%+cbi/valueheader%>
+
+
+
+
+
+
+
+
+
+
+<%fs=require"nixio.fs"%>
+<%if fs.access("/tmp/AdGuardHometmpconfig.yaml") then%>
+
+<%end%>
+
+<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/luci-app-adguardhome/root/etc/AdGuardHome.yaml b/luci-app-adguardhome/root/etc/AdGuardHome.yaml
new file mode 100644
index 00000000..4bef352f
--- /dev/null
+++ b/luci-app-adguardhome/root/etc/AdGuardHome.yaml
@@ -0,0 +1,226 @@
+bind_host: 0.0.0.0
+bind_port: 3000
+beta_bind_port: 0
+users:
+  - name: admin
+    password: $2y$10$vHRcARdPCieYG3RXWomV5evDYN.Nj/edtwEkQgQJZcK6z7qTLaIc6
+auth_attempts: 5
+block_auth_min: 15
+http_proxy: ""
+language: zh-cn
+rlimit_nofile: 0
+debug_pprof: false
+web_session_ttl: 720
+dns:
+  bind_hosts:
+  - 0.0.0.0
+  port: 5553
+  statistics_interval: 1
+  querylog_enabled: true
+  querylog_file_enabled: true
+  querylog_interval: 1
+  querylog_size_memory: 1000
+  anonymize_client_ip: false
+  protection_enabled: true
+  blocking_mode: default
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_response_ttl: 10
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  ratelimit: 0
+  ratelimit_whitelist: []
+  refuse_any: false
+  upstream_dns:
+    - 223.5.5.5
+  upstream_dns_file: ""
+  bootstrap_dns:
+    - 119.29.29.29
+    - 223.5.5.5
+  all_servers: false
+  fastest_addr: false
+  fastest_timeout: 1s
+  allowed_clients: []
+  disallowed_clients: []
+  blocked_hosts:
+    - version.bind
+    - id.server
+    - hostname.bind
+  trusted_proxies:
+    - 127.0.0.0/8
+    - ::1/128
+  cache_size: 4194304
+  cache_ttl_min: 0
+  cache_ttl_max: 0
+  cache_optimistic: true
+  bogus_nxdomain: []
+  aaaa_disabled: false
+  enable_dnssec: false
+  edns_client_subnet: false
+  max_goroutines: 300
+  ipset: []
+  filtering_enabled: true
+  filters_update_interval: 24
+  parental_enabled: false
+  safesearch_enabled: false
+  safebrowsing_enabled: false
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  rewrites: []
+  blocked_services: []
+  upstream_timeout: 10s
+  local_domain_name: lan
+  resolve_clients: true
+  use_private_ptr_resolvers: true
+  local_ptr_upstreams: []
+tls:
+  enabled: false
+  server_name: ""
+  force_https: false
+  port_https: 443
+  port_dns_over_tls: 853
+  port_dns_over_quic: 784
+  port_dnscrypt: 0
+  dnscrypt_config_file: ""
+  allow_unencrypted_doh: false
+  strict_sni_check: false
+  certificate_chain: ""
+  private_key: ""
+  certificate_path: ""
+  private_key_path: ""
+filters:
+  - enabled: true
+    url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+    name: AdGuard DNS filter
+    id: 1228750870
+  - enabled: true
+    url: http://sub.adtchrome.com/adt-chinalist-easylist.txt
+    name: 广告终结者使用的拦截规则，基于ChinaList+EasyList修正维护
+    id: 139789181
+  - enabled: true
+    url: https://easylist-downloads.adblockplus.org/easylist.txt
+    name: EasyList-去除国际网页中大多数广告，包括不需要的框架、图像和对象
+    id: 139789112
+  - enabled: true
+    url: https://easylist-downloads.adblockplus.org/easylistchina.txt
+    name: EasyList China-EasyList针对国内的补充规则
+    id: 139789121
+  - enabled: true
+    url: https://anti-ad.net/adguard.txt
+    name: anti-AD命中率最高列表
+    id: 139789122
+  - enabled: true
+    url: https://raw.iqiq.io/banbendalao/ADgk/master/ADgk.txt
+    name: ADgk去广告easylistchina补充规则
+    id: 139789131
+  - enabled: true
+    url: https://raw.iqiq.io/banbendalao/ADgk/master/kill-baidu-ad.txt
+    name: ADgk百度广告过滤
+    id: 139789133
+  - enabled: false
+    url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext
+    name: Peter Lowe’s Ad and tracking server list​
+    id: 139789152
+  - enabled: false
+    url: https://easylist.to/easylist/fanboy-social.txt
+    name: Fanboy's Social Blocking List
+    id: 139789153
+  - enabled: false
+    url: https://easylist.to/easylist/fanboy-annoyance.txt
+    name: Fanboy's Annoyance List
+    id: 139789154
+  - enabled: false
+    url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt
+    name: EasyList Cookie List
+    id: 139789155
+  - enabled: false
+    url: https://fanboy.co.nz/fanboy-antifacebook.txt
+    name: Anti-Facebook List
+    id: 139789161
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/14.txt
+    name: AdGuard Annoyances filter
+    id: 139789162
+  - enabled: false
+    url: https://www.fanboy.co.nz/enhancedstats.txt
+    name: Fanboy's Enhanced Tracking List
+    id: 139789164
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/3.txt
+    name: AdGuard Tracking Protection filter
+    id: 139789165
+  - enabled: false
+    url: https://easylist.to/easylist/easylist.txt
+    name: EasyList
+    id: 139789171
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/11.txt
+    name: AdGuard Mobile Ads filter
+    id: 139789172
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
+    name: AdGuard Base filter
+    id: 139789173
+  - enabled: false
+    url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
+    name: Adblock Warning Removal List
+    id: 139789174
+  - enabled: false
+    url: https://fanboy.co.nz/fanboy-problematic-sites.txt
+    name: Fanboy's problematic-sites
+    id: 139789175
+  - enabled: false
+    url: https://adaway.org/hosts.txt
+    name: Adaway HOST
+    id: 139789187
+whitelist_filters: []
+user_rules:
+  - '@@||taobao.com^$important'
+  - '@@||tmall.com^$important'
+  - '@@||jd.com^important'
+  - '@@||flyme.cn^$important'
+  - '@@||meizu.com^$important'
+  - '@@||wl.jd.com^$important'
+  - '@@||flydigi.com^'
+  - '@@||pv.sohu.com^$important'
+  - /googleads.$~script,domain=~googleads.github.io
+  - /pagead/lvz?
+  - '||google.com/pagead/'
+  - '||static.doubleclick.net^$domain=youtube.com'
+  - '||youtube.com/get_midroll_'
+  - '||5hz.org^'
+  - '@@||000714.xyz^'
+  - '@@||blueskyxn.com^'
+  - '||topnewsfeeds.net^'
+  - '||nbryb.com^'
+  - '||superbdolly.com^'
+  - '||salutationcheerlessdemote.com^'
+  - '||buildingdoodlesquare.com^'
+  - '||colonistnobilityheroic.com^'
+dhcp:
+  enabled: false
+  interface_name: ""
+  dhcpv4:
+    gateway_ip: ""
+    subnet_mask: ""
+    range_start: ""
+    range_end: ""
+    lease_duration: 86400
+    icmp_timeout_msec: 1000
+    options: []
+  dhcpv6:
+    range_start: ""
+    lease_duration: 86400
+    ra_slaac_only: false
+    ra_allow_slaac: false
+clients: []
+log_compress: false
+log_localtime: false
+log_max_backups: 0
+log_max_size: 100
+log_max_age: 3
+log_file: ""
+verbose: false
+schema_version: 10
diff --git a/luci-app-adguardhome/root/etc/config/AdGuardHome b/luci-app-adguardhome/root/etc/config/AdGuardHome
index fb562bb1..827b291d 100644
--- a/luci-app-adguardhome/root/etc/config/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/config/AdGuardHome
@@ -1,11 +1,17 @@
-
 config AdGuardHome 'AdGuardHome'
 	option enabled '0'
 	option httpport '3000'
 	option redirect 'none'
 	option configpath '/etc/AdGuardHome.yaml'
-	option workdir '/tmp/AdGuardHome'
+	option workdir '/etc/AdGuardHome'
 	option logfile '/tmp/AdGuardHome.log'
 	option verbose '0'
-	option binpath '/usr/bin/AdGuardHome/AdGuardHome'
-	list wan_ifname 'eth0'
+	option binpath '/usr/bin/AdGuardHome'
+	option upxflag ''
+	option user ''
+	option group ''
+	option advanced_settings '0'
+	option gc '0'
+	option maxprocs '0'
+	option memlimit '0'
+
diff --git a/luci-app-adguardhome/root/etc/init.d/AdGuardHome b/luci-app-adguardhome/root/etc/init.d/AdGuardHome
index dfa233b6..651ecd90 100755
--- a/luci-app-adguardhome/root/etc/init.d/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/init.d/AdGuardHome
@@ -6,648 +6,685 @@ START=95
 STOP=01
 
 CONFIGURATION=AdGuardHome
-NFT_RULES_FILE="/var/etc/adguardhome.nft"
-NFT_RULES_TPL="/usr/share/AdGuardHome/adguardhome.nft.tpl"
-NFT_TABLE="adguardhome"
+CRON_FILE=/etc/crontabs/root
 
-EXTRA_COMMANDS="do_redirect force_reload isrunning"
-EXTRA_HELP="        do_redirect 0 or 1\
-		force_reload
-		isrunning"
+extra_command "do_redirect" "0 or 1"
+extra_command "testbackup" "backup or restore"
+extra_command "test_crontab"
+extra_command "force_reload"
+extra_command "isrunning"
 
-get_wan_return_line() {
-    local wan
-    wan="$(uci -q get AdGuardHome.AdGuardHome.wan_ifname 2>/dev/null)"
+set_forward_dnsmasq()
+{
+	local PORT="$1"
+	local addr="127.0.0.1#$PORT"
+	local OLD_SERVER="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
+	echo "$OLD_SERVER" | grep -q "^$addr"
+	[ $? -eq 0 ] && return
 
-    [ -z "$wan" ] && { echo ""; return 0; }
-
-    local wan_set
-    wan_set="\"$(printf '%s' "$wan" | sed 's/ /\", \"/g')\""
-    echo "iifname { $wan_set } return"
+	uci delete dhcp.@dnsmasq[0].server 2>/dev/null
+	uci add_list dhcp.@dnsmasq[0].server="$addr"
+	for server in $OLD_SERVER; do
+		[ "$server" = "$addr" ] && continue
+	done
+	uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
+	uci set dhcp.@dnsmasq[0].noresolv=1
+	uci commit dhcp
+	/etc/init.d/dnsmasq restart
 }
 
-set_nft_redirect() {
-    local port="$1"
-    case "$port" in
-        *[!0-9]*|"") return 1 ;;
-    esac
-    [ ! -f "$NFT_RULES_TPL" ] && return 1
+stop_forward_dnsmasq()
+{
+	local OLD_PORT="$1"
+	local addr="127.0.0.1#$OLD_PORT"
+	local OLD_SERVER="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
+	echo "$OLD_SERVER" | grep -q "^$addr"
+	[ $? -ne 0 ] && return
 
-    local return_line
-    return_line="$(get_wan_return_line)"
-
-    awk -v port="$port" -v wan_line="$return_line" '{
-        gsub("__AGH_PORT__", port)
-        gsub("__AGH_WAN_RETURN_LINE__", wan_line)
-        print
-    }' "$NFT_RULES_TPL" > "$NFT_RULES_FILE" || return 1
-
-    [ ! -s "$NFT_RULES_FILE" ] && return 1
-
-    nft delete table inet "$NFT_TABLE" 2>/dev/null
-    nft -f "$NFT_RULES_FILE" 2>/dev/null
+	uci del_list dhcp.@dnsmasq[0].server="$addr" 2>/dev/null
+	local addrlist="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
+	if [ -z "$addrlist" ]; then
+		uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
+		uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
+	fi
+	uci commit dhcp
+	/etc/init.d/dnsmasq restart
 }
 
-clear_nft_redirect() {
-    uci -q delete firewall.adguardhome_nft_include
-    uci -q commit firewall
+set_iptable()
+{
+	local ipv6_server="$1"
+	local tcp_server="$2"
 
-    [ -f "$NFT_RULES_FILE" ] && rm -f "$NFT_RULES_FILE"
-    nft delete table inet "$NFT_TABLE" 2>/dev/null
+	uci -q batch <<-EOF >/dev/null 2>&1
+	delete firewall.AdGuardHome
+	set firewall.AdGuardHome=include
+	set firewall.AdGuardHome.type=script
+	set firewall.AdGuardHome.path=/usr/share/AdGuardHome/firewall.start
+	set firewall.AdGuardHome.reload=1
+	commit firewall
+	EOF
+
+	local IPS="$(ip -4 addr show | grep inet | grep -v ':' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)"
+	for IP in $IPS; do
+		[ -z "$IP" ] && continue
+		iptables -t nat -I PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$AdGuardHome_PORT" >/dev/null 2>&1
+		[ "$tcp_server" = "1" ] && iptables -t nat -I PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$AdGuardHome_PORT" >/dev/null 2>&1
+	done
+
+	[ "$ipv6_server" = "0" ] && return
+
+	IPS="$(ip -6 addr show | grep inet6 | grep -v 'fe80::' | grep -v '::1' | grep 'Global' | awk '{print $2}' | cut -d'/' -f1)"
+	for IP in $IPS; do
+		[ -z "$IP" ] && continue
+		ip6tables -t nat -I PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$AdGuardHome_PORT" >/dev/null 2>&1
+		[ "$tcp_server" = "1" ] && ip6tables -t nat -I PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$AdGuardHome_PORT" >/dev/null 2>&1
+	done
 }
 
-wait_for_pid_exit() {
-    local pid="$1" attempts=0
-    case "$pid" in ''|*[!0-9]*) return 0 ;; esac
-    while kill -0 "$pid" 2>/dev/null; do
-        [ "$attempts" -lt 15 ] || return 1
-        sleep 1
-        attempts=$((attempts + 1))
-    done
-}
+clear_iptable()
+{
+	uci -q batch <<-EOF >/dev/null 2>&1
+	delete firewall.AdGuardHome
+	commit firewall
+	EOF
 
-wait_for_dns_port_release() {
-    local port="$1" attempts=0 tables="" table busy
-    for table in /proc/net/tcp /proc/net/tcp6 /proc/net/udp /proc/net/udp6; do
-        [ -r "$table" ] && tables="$tables $table"
-    done
-    [ -n "$tables" ] || return 1
-    port="$(printf '%04X' "$port")" || return 1
-    while :; do
-        busy="$(awk -v port="$port" '
-            FNR > 1 {
-                split($2, address, ":")
-                if (toupper(address[2]) == port &&
-                    ((FILENAME ~ /tcp/ && $4 == "0A") ||
-                     (FILENAME ~ /udp/ && $4 == "07"))) found = 1
-            }
-            END { print found ? 1 : 0 }
-        ' $tables)" || return 1
-        [ "$busy" = "0" ] && return 0
-        [ "$attempts" -lt 15 ] || return 1
-        sleep 1
-        attempts=$((attempts + 1))
-    done
-}
+	local OLD_PORT="$1"
+	local ipv6_server="$2"
+	local IPS="$(ip -4 addr show | grep inet | grep -v ':' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)"
+	for IP in $IPS; do
+		[ -z "$IP" ] && continue
+		iptables -t nat -D PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
+		iptables -t nat -D PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
+	done
 
-restart_dnsmasq() {
-    local released_port="$1" service pids pid
-    service="$(ubus call service list '{"name":"dnsmasq"}' 2>/dev/null)" || return 1
-    pids="$(printf '%s' "$service" | jsonfilter -e '@.dnsmasq.instances.*.pid')"
-    /etc/init.d/dnsmasq stop 8>&- 1000>&- || return 1
-    for pid in $pids; do
-        if ! wait_for_pid_exit "$pid"; then
-            logger -t AdGuardHome 'dnsmasq did not stop; refusing to reuse its old jail.'
-            return 1
-        fi
-    done
-    if [ -n "$released_port" ] && ! wait_for_dns_port_release "$released_port"; then
-        logger -t AdGuardHome "DNS port $released_port is still occupied after stopping dnsmasq."
-        /etc/init.d/dnsmasq start 8>&- 1000>&-
-        return 1
-    fi
-    /etc/init.d/dnsmasq start 8>&- 1000>&- || return 1
-    if [ -n "$released_port" ] && ! wait_for_dns_port_release "$released_port"; then
-        logger -t AdGuardHome "DNS port $released_port was occupied again after starting dnsmasq."
-        return 1
-    fi
-    return 0
-}
-
-save_dnsmasq_upstream_config() {
-    local backup="AdGuardHome.dnsmasq_backup" option value server
-    [ "$(uci -q get "$backup.ready")" = "1" ] && return 0
-
-    uci -q delete "$backup"
-    uci set "$backup=dnsmasq_backup" || return 1
-    value="$(uci -q get dhcp.@dnsmasq[0].server)"
-    for server in $value; do
-        uci add_list "$backup.server=$server" || return 1
-    done
-    for option in resolvfile noresolv; do
-        if value="$(uci -q get "dhcp.@dnsmasq[0].$option")"; then
-            uci set "$backup.$option=$value" || return 1
-        fi
-    done
-    uci set "$backup.ready=1" || return 1
-    if ! uci commit AdGuardHome; then
-        uci -q revert "$backup"
-        return 1
-    fi
-}
-
-apply_dnsmasq_config() {
-    [ "${AGH_DEFER_DNSMASQ_RESTART:-0}" = "1" ] && return 0
-    restart_dnsmasq "$@"
-}
-
-is_scoped_dnsmasq_server() {
-    local domains="${1%/*}"
-    case "$1" in
-        /*) case "$domains/" in */\#/*) return 1 ;; esac; return 0 ;;
-    esac
-    return 1
-}
-
-set_forward_dnsmasq() (
-    set -f
-    local addr="127.0.0.1#$1" servers desired server
-
-    if [ "$(uci -q get AdGuardHome.dnsmasq_backup.ready)" != "1" ] &&
-       [ "$2" = "dnsmasq-upstream" ] && [ "$3" = "1" ]; then
-        stop_forward_dnsmasq "$4" || return 1
-    fi
-    save_dnsmasq_upstream_config || return 1
-
-    servers="$(uci -q get dhcp.@dnsmasq[0].server)"
-    desired="$addr"
-    for server in $servers; do
-        is_scoped_dnsmasq_server "$server" && desired="$desired $server"
-    done
-    if [ "$servers" = "$desired" ] && [ "$(uci -q get dhcp.@dnsmasq[0].noresolv)" = "1" ]; then
-        return 0
-    fi
-
-    uci -q delete dhcp.@dnsmasq[0].server
-    for server in $desired; do
-        uci add_list "dhcp.@dnsmasq[0].server=$server" || return 1
-    done
-    uci set dhcp.@dnsmasq[0].noresolv=1 || return 1
-    uci commit dhcp || return 1
-    apply_dnsmasq_config >/dev/null 2>&1
-)
-
-stop_forward_dnsmasq() (
-    set -f
-    local backup="AdGuardHome.dnsmasq_backup" option value server
-    local addr="127.0.0.1#$1" found=0 has_general=0
-
-    if [ "$(uci -q get "$backup.ready")" = "1" ]; then
-        uci -q delete dhcp.@dnsmasq[0].server
-        value="$(uci -q get "$backup.server")"
-        for server in $value; do
-            uci add_list "dhcp.@dnsmasq[0].server=$server" || return 1
-        done
-        for option in resolvfile noresolv; do
-            if value="$(uci -q get "$backup.$option")"; then
-                uci set "dhcp.@dnsmasq[0].$option=$value" || return 1
-            else
-                uci -q delete "dhcp.@dnsmasq[0].$option"
-            fi
-        done
-        uci commit dhcp || return 1
-        apply_dnsmasq_config >/dev/null 2>&1 || return 1
-        [ "${AGH_DEFER_DNSMASQ_RESTART:-0}" = "1" ] && return 0
-        uci -q delete "$backup"
-        uci commit AdGuardHome
-        return $?
-    fi
-
-    value="$(uci -q get dhcp.@dnsmasq[0].server)"
-    for server in $value; do
-        if [ "$server" = "$addr" ]; then
-            found=1
-        elif ! is_scoped_dnsmasq_server "$server"; then
-            has_general=1
-        fi
-    done
-    [ "$found" = "1" ] || return 0
-    uci -q del_list "dhcp.@dnsmasq[0].server=$addr" || return 1
-    if [ "$has_general" = "0" ]; then
-        if ! uci -q get dhcp.@dnsmasq[0].resolvfile >/dev/null; then
-            value="/tmp/resolv.conf.d/resolv.conf.auto"
-            [ -f "$value" ] || value="/tmp/resolv.conf.auto"
-            uci set "dhcp.@dnsmasq[0].resolvfile=$value" || return 1
-        fi
-        uci -q delete dhcp.@dnsmasq[0].noresolv
-    fi
-    logger -t AdGuardHome 'No DNS snapshot from previous version; removed old upstream, original resolver settings are unavailable.'
-    uci commit dhcp || return 1
-    apply_dnsmasq_config >/dev/null 2>&1
-)
-
-stop_core() {
-    local service instance pid
-    service="$(ubus call service list '{"name":"AdGuardHome"}' 2>/dev/null)" || return 1
-    instance="$(printf '%s' "$service" | jsonfilter -e '@.AdGuardHome.instances.instance1')"
-    [ -n "$instance" ] || return 0
-    pid="$(printf '%s' "$instance" | jsonfilter -e '@.pid')"
-    ubus call service delete '{"name":"AdGuardHome","instance":"instance1"}' >/dev/null || return 1
-    if ! wait_for_pid_exit "$pid"; then
-        logger -t AdGuardHome 'Core did not stop; DNS port settings were not changed.'
-        return 1
-    fi
-}
-
-agh_reload() {
-    [ "${AGH_REDIRECT_RELOAD:-1}" = "1" ] || return 0
-    if [ "${AGH_DEFER_DNSMASQ_RESTART:-0}" = "1" ]; then
-        AGH_RELOAD_PENDING=1
-        return 0
-    fi
-    ubus call service event '{"type":"config.change","data":{"package":"AdGuardHome"}}' >/dev/null 2>&1
-}
-
-rm_port53() {
-    local configpath
-    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-
-    local AdGuardHome_PORT dnsmasq_port
-    AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
-    dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
-    [ -z "$dnsmasq_port" ] && dnsmasq_port="53"
-
-    if [ "$dnsmasq_port" = "$AdGuardHome_PORT" ]; then
-        [ "$dnsmasq_port" = "53" ] && dnsmasq_port="1745"
-    elif [ "$dnsmasq_port" = "53" ]; then
-        return
-    fi
-
-    stop_core || return 1
-    config_editor "dns.port" "$dnsmasq_port" "$configpath"
-    [ "$(config_editor "dns.port" "" "$configpath" "1")" = "$dnsmasq_port" ] || return 1
-    uci set dhcp.@dnsmasq[0].port="53" || return 1
-    uci commit dhcp || return 1
-    apply_dnsmasq_config "$dnsmasq_port" || return 1
-    agh_reload
-}
-
-use_port53() {
-    local configpath
-    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-
-    local AdGuardHome_PORT dnsmasq_port
-    AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
-    dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
-    [ -z "$dnsmasq_port" ] && dnsmasq_port="53"
-
-    if [ "$dnsmasq_port" = "$AdGuardHome_PORT" ]; then
-        [ "$dnsmasq_port" = "53" ] && AdGuardHome_PORT="1745"
-    elif [ "$AdGuardHome_PORT" = "53" ]; then
-        return
-    fi
-
-    stop_core || return 1
-    config_editor "dns.port" "53" "$configpath"
-    [ "$(config_editor "dns.port" "" "$configpath" "1")" = "53" ] || return 1
-    uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT" || return 1
-    uci commit dhcp || return 1
-    apply_dnsmasq_config "$dnsmasq_port" || return 1
-    agh_reload
-}
-
-mark_redirect_flag() {
-    local enabled="$1" redirect="$2" agh_port="$3"
-
-    local configpath
-    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-
-    local flag=0
-
-    if [ "$enabled" = "1" ] && [ "$redirect" != "none" ]; then
-        flag=1
-
-        if [ "$redirect" = "redirect" ]; then
-            nft list table inet "$NFT_TABLE" >/dev/null 2>&1 || flag=0
-
-        elif [ "$redirect" = "dnsmasq-upstream" ]; then
-            local s
-            s="$(uci -q get dhcp.@dnsmasq[0].server | tr '\n' ' ')"
-            printf '%s\n' "$s" | grep -q -E "(^|[[:space:]])127\.0\.0\.1#${agh_port}([[:space:]]|$)" || flag=0
-
-        elif [ "$redirect" = "exchange" ]; then
-            local cfgp dport
-            cfgp="$(config_editor "dns.port" "" "$configpath" "1")"
-            dport="$(uci -q get dhcp.@dnsmasq[0].port)"
-            if [ "$cfgp" != "53" ] || [ "$dport" = "53" ] ; then
-                flag=0
-            fi
-        fi
-    fi
-
-    echo -n "$flag" > /var/run/AdGredir
-}
-
-finish_dnsmasq_config() {
-    case "$old_redirect:$redirect" in
-        *dnsmasq-upstream*|*exchange*)
-            if [ "$dnsmasq_before" != "$(uci -q export dhcp)" ] || [ "$previous_flag" != "1" ] || [ "$enabled" = "0" ]; then
-                local released_port=""
-                if [ "$enabled" = "1" ] && [ "$redirect" = "exchange" ]; then
-                    released_port=53
-                elif [ "$dnsmasq_previous_port" != "$(uci -q get dhcp.@dnsmasq[0].port)" ]; then
-                    released_port="$dnsmasq_previous_port"
-                fi
-                restart_dnsmasq "$released_port" || return 1
-            fi
-            ;;
-    esac
-    if { [ "$enabled" = "0" ] || [ "$redirect" != "dnsmasq-upstream" ]; } &&
-       [ "$(uci -q get AdGuardHome.dnsmasq_backup.ready)" = "1" ]; then
-        uci -q delete AdGuardHome.dnsmasq_backup
-        uci commit AdGuardHome || return 1
-    fi
-    return 0
-}
-
-_do_redirect() (
-    exec 8>/var/lock/AdGuardHome-redirect.lock || return 1
-    flock -w 10 8 || return 1
-    local AGH_DEFER_DNSMASQ_RESTART=1 AGH_RELOAD_PENDING=0
-    local dnsmasq_before dnsmasq_previous_port previous_flag
-    dnsmasq_before="$(uci -q export dhcp)" || return 1
-    dnsmasq_previous_port="$(uci -q get dhcp.@dnsmasq[0].port)"
-    dnsmasq_previous_port="${dnsmasq_previous_port:-53}"
-    previous_flag="$(cat /var/run/AdGredir 2>/dev/null)"
-    echo -n "0" > /var/run/AdGredir
-    local section="$CONFIGURATION"
-    args=""
-    ipv6_server=1
-    tcp_server=0
-    enabled="$1"
-    AGH_REDIRECT_RELOAD="${2:-$enabled}"
-
-    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-    AdGuardHome_PORT="$(config_editor "dns.port" "" "$configpath" "1")"
-    [ -z "$AdGuardHome_PORT" ] && AdGuardHome_PORT="0"
-
-    config_get redirect      "$section" redirect      "none"
-    config_get old_redirect  "$section" old_redirect  "none"
-    config_get old_port      "$section" old_port      "0"
-    config_get old_enabled   "$section" old_enabled   "0"
-
-    uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1
-    uci commit dhcp
-
-    if [ "$old_enabled" = "1" ] && [ "$old_redirect" = "exchange" ]; then
-        AdGuardHome_PORT="$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)"
-    fi
-
-    if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$AdGuardHome_PORT" ] || { [ "$old_enabled" = "1" ] && [ "$enabled" = "0" ]; }; then
-        if [ "$old_redirect" != "none" ]; then
-            if [ "$old_redirect" = "redirect" ] && [ "$old_port" != "0" ]; then
-                clear_nft_redirect
-            elif [ "$old_redirect" = "dnsmasq-upstream" ]; then
-                if [ "$old_enabled" = "1" ] || [ "$(uci -q get AdGuardHome.dnsmasq_backup.ready)" = "1" ]; then
-                    if ! stop_forward_dnsmasq "$old_port"; then
-                        echo -n "0" > /var/run/AdGredir
-                        return 1
-                    fi
-                fi
-                old_enabled=0
-            elif [ "$old_redirect" = "exchange" ]; then
-                if ! rm_port53; then
-                    echo -n "0" > /var/run/AdGredir
-                    return 1
-                fi
-            fi
-        fi
-    elif [ "$old_enabled" = "1" ] && [ "$enabled" = "1" ]; then
-        if [ "$old_redirect" = "redirect" ] && [ "$old_port" != "0" ]; then
-            clear_nft_redirect
-        fi
-    fi
-
-    uci delete AdGuardHome.@AdGuardHome[0].old_redirect 2>/dev/null
-    uci delete AdGuardHome.@AdGuardHome[0].old_port 2>/dev/null
-    uci delete AdGuardHome.@AdGuardHome[0].old_enabled 2>/dev/null
-    uci add_list AdGuardHome.@AdGuardHome[0].old_redirect="$redirect" 2>/dev/null
-    uci add_list AdGuardHome.@AdGuardHome[0].old_port="$AdGuardHome_PORT" 2>/dev/null
-    uci add_list AdGuardHome.@AdGuardHome[0].old_enabled="$enabled" 2>/dev/null
-    uci commit AdGuardHome
-
-    if [ "$enabled" = "0" ] || [ "$AdGuardHome_PORT" = "0" ]; then
-        finish_dnsmasq_config || return 1
-        echo -n "0" > /var/run/AdGredir
-        return 1
-    fi
-
-    if [ "$redirect" = "redirect" ]; then
-        set_nft_redirect "$AdGuardHome_PORT"
-    elif [ "$redirect" = "dnsmasq-upstream" ]; then
-        if ! set_forward_dnsmasq "$AdGuardHome_PORT" "$old_redirect" "$old_enabled" "$old_port"; then
-            echo -n "0" > /var/run/AdGredir
-            return 1
-        fi
-    elif [ "$redirect" = "exchange" ] && [ "$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)" = "53" ]; then
-        if ! use_port53; then
-            echo -n "0" > /var/run/AdGredir
-            return 1
-        fi
-    fi
-
-    finish_dnsmasq_config || return 1
-    mark_redirect_flag "$enabled" "$redirect" "$AdGuardHome_PORT" || return 1
-    AGH_DEFER_DNSMASQ_RESTART=0
-    [ "$AGH_RELOAD_PENDING" = "0" ] || agh_reload
-    return 0
-)
-
-do_redirect() {
-    config_load "${CONFIGURATION}"
-    _do_redirect "$1"
+	[ "$ipv6_server" = "0" ] && return
+	echo "warn ip6tables nat mod is needed"
+	IPS="$(ip -6 addr show | grep inet6 | grep -v 'fe80::' | grep -v '::1' | grep 'Global' | awk '{print $2}' | cut -d'/' -f1)"
+	for IP in $IPS; do
+		[ -z "$IP" ] && continue
+		ip6tables -t nat -D PREROUTING -p udp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
+		ip6tables -t nat -D PREROUTING -p tcp -d "$IP" --dport 53 -j REDIRECT --to-ports "$OLD_PORT" >/dev/null 2>&1
+	done
 }
 
 service_triggers() {
-    procd_add_reload_trigger "$CONFIGURATION"
+	procd_add_reload_trigger "$CONFIGURATION"
+	[ "$(uci get AdGuardHome.AdGuardHome.redirect 2>/dev/null)" = "redirect" ] && procd_add_reload_trigger firewall
 }
 
-isrunning() {
-    config_load "${CONFIGURATION}"
-    _isrunning
-    local r=$?
-    [ "$r" = "0" ] && echo "running" || ([ "$r" = "1" ] && echo "not run" || echo "no bin")
-    return $r
+isrunning(){
+	config_load "${CONFIGURATION}"
+	_isrunning
+	local r=$?
+	if [ "$r" = "0" ]; then
+		echo "running"
+	elif [ "$r" = "1" ]; then
+		echo "not run"
+	else
+		echo "no bin"
+	fi
+	return $r
 }
 
-_isrunning() {
-    config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
-    [ ! -f "$binpath" ] && return 2
-    pgrep -f "$(basename "$binpath")" >/dev/null 2>&1 && return 0
-    return 1
+_isrunning(){
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	[ ! -f "$binpath" ] && return 2
+	# 用进程名匹配，避免 pgrep -f 自匹配
+	pgrep "${binpath##*/}" >/dev/null 2>&1 && return 0
+	return 1
 }
 
-force_reload() {
-    config_load "${CONFIGURATION}"
-    _isrunning && procd_send_signal "$CONFIGURATION" || start
+force_reload(){
+	config_load "${CONFIGURATION}"
+	if _isrunning; then
+		procd_send_signal "$CONFIGURATION"
+	else
+		start
+	fi
 }
 
-get_tz() {
-    SET_TZ=""
-    [ -e "/etc/localtime" ] && return
-    for tzfile in /etc/TZ /var/etc/TZ; do
-        [ -e "$tzfile" ] && tz="$(cat "$tzfile" 2>/dev/null)" && break
-    done
-    [ -n "$tz" ] && SET_TZ=$tz
+get_tz()
+{
+	SET_TZ=""
+
+	[ -e "/etc/localtime" ] && return
+
+	for tzfile in /etc/TZ /var/etc/TZ; do
+		[ ! -e "$tzfile" ] && continue
+		tz="$(cat "$tzfile" 2>/dev/null)"
+	done
+
+	[ -z "$tz" ] && return
+	SET_TZ="$tz"
 }
 
-get_filesystem() {
-    echo "$1" | awk '
-    BEGIN{
-        while (("mount"| getline ret) > 0) {
-            split(ret,d); fs[d[3]]=d[5];
-            m=index(d[1],":");
-            if (m==0) { pt[d[3]]=d[1] } else { pt[d[3]]=substr(d[1],m+1) }
-        }
-    }
-    {
-        split($0,d,"/");
-        if ("/" in fs) { result1=fs["/"]; }
-        if ("/" in pt) { result2=pt["/"]; }
-        for (i=2;i<=length(d);i++) {
-           p[i]=p[i-1]"/"d[i];
-           if (p[i] in fs) { result1=fs[p[i]]; result2=pt[p[i]]; }
-        }
-        if (result2 in fs) { result=fs[result2] } else { result=result1 }
-        print(result);
-    }'
+rm_port53()
+{
+	local AdGuardHome_PORT
+	AdGuardHome_PORT="$(config_editor "dns.port" "" "$configpath" "1")"
+	local dnsmasq_port="$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)"
+	[ -z "$dnsmasq_port" ] && dnsmasq_port="53"
+
+	if [ "$dnsmasq_port" = "$AdGuardHome_PORT" ]; then
+		[ "$dnsmasq_port" = "53" ] && dnsmasq_port="1745"
+	elif [ "$dnsmasq_port" = "53" ]; then
+		return
+	fi
+
+	config_editor "dns.port" "$dnsmasq_port" "$configpath"
+	uci set dhcp.@dnsmasq[0].port="53"
+	uci commit dhcp
+
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	local binname="${binpath##*/}"
+	pkill -TERM "$binname" 2>/dev/null
+	sleep 2
+	pkill -KILL "$binname" 2>/dev/null
+	/etc/init.d/dnsmasq restart
 }
 
-config_editor() {
-    awk -v yaml="$1" -v value="$2" -v file="$3" -v ro="$4" '
-    BEGIN{split(yaml,part,"\.");s="";i=1;l=length(part);}
-    {
-        if (match($0,s""part[i]":")) {
-            if (i==l) {
-                split($0,t,": ");
-                if (ro==""){
-                    system("sed -i '\''"FNR"c\\" t[1] ": " value "'\'' " file);
-                } else {
-                    print(t[2]);
-                }
-                exit;
-            }
-            s=s"[- ]{2}";
-            i++;
-        }
-    }' "$3"
+use_port53()
+{
+	local AdGuardHome_PORT
+	AdGuardHome_PORT="$(config_editor "dns.port" "" "$configpath" "1")"
+	local dnsmasq_port="$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)"
+	[ -z "$dnsmasq_port" ] && dnsmasq_port="53"
+	# AGH 端口未配置或无法读取时，使用默认 1745 作为 dnsmasq 的新端口
+	[ -z "$AdGuardHome_PORT" ] && AdGuardHome_PORT="1745"
+
+	if [ "$dnsmasq_port" = "$AdGuardHome_PORT" ]; then
+		[ "$dnsmasq_port" = "53" ] && AdGuardHome_PORT="1745"
+	elif [ "$AdGuardHome_PORT" = "53" ]; then
+		return
+	fi
+
+	config_editor "dns.port" "53" "$configpath"
+	uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT"
+	uci commit dhcp
+	/etc/init.d/dnsmasq reload
+}
+
+do_redirect()
+{
+	config_load "${CONFIGURATION}"
+	_do_redirect "$1"
+}
+
+_do_redirect()
+{
+	local section="$CONFIGURATION"
+	ipv6_server=1
+	tcp_server=0
+	local enabled="$1"
+
+	if [ "$enabled" = "1" ]; then
+		echo -n "1" > /var/run/AdGredir
+	else
+		echo -n "0" > /var/run/AdGredir
+	fi
+
+	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+	AdGuardHome_PORT="$(config_editor "dns.port" "" "$configpath" "1")"
+
+	[ ! -s "$configpath" ] && cp -f /usr/share/AdGuardHome/AdGuardHome_template.yaml "$configpath"
+	[ -z "$AdGuardHome_PORT" ] && AdGuardHome_PORT="0"
+
+	config_get redirect "$section" redirect "none"
+	config_get old_redirect "$section" old_redirect "none"
+	config_get old_port "$section" old_port "0"
+	config_get old_enabled "$section" old_enabled "0"
+
+	uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1
+
+	if [ "$old_enabled" = "1" ] && [ "$old_redirect" = "exchange" ]; then
+		AdGuardHome_PORT="$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)"
+	fi
+
+	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$AdGuardHome_PORT" ] || { [ "$old_enabled" = "1" ] && [ "$enabled" = "0" ]; }; then
+		if [ "$old_redirect" != "none" ]; then
+			if [ "$old_redirect" = "redirect" ] && [ "$old_port" != "0" ]; then
+				clear_iptable "$old_port" "$ipv6_server"
+			elif [ "$old_redirect" = "dnsmasq-upstream" ]; then
+				stop_forward_dnsmasq "$old_port"
+			elif [ "$old_redirect" = "exchange" ]; then
+				rm_port53
+			fi
+		fi
+	elif [ "$old_enabled" = "1" ] && [ "$enabled" = "1" ]; then
+		if [ "$old_redirect" = "redirect" ] && [ "$old_port" != "0" ]; then
+			clear_iptable "$old_port" "$ipv6_server"
+		fi
+	fi
+
+	uci delete AdGuardHome.@AdGuardHome[0].old_redirect 2>/dev/null
+	uci delete AdGuardHome.@AdGuardHome[0].old_port 2>/dev/null
+	uci delete AdGuardHome.@AdGuardHome[0].old_enabled 2>/dev/null
+	uci add_list AdGuardHome.@AdGuardHome[0].old_redirect="$redirect" 2>/dev/null
+	uci add_list AdGuardHome.@AdGuardHome[0].old_port="$AdGuardHome_PORT" 2>/dev/null
+	uci add_list AdGuardHome.@AdGuardHome[0].old_enabled="$enabled" 2>/dev/null
+	uci commit AdGuardHome
+
+	[ "$enabled" = "0" ] && return 1
+	[ "$AdGuardHome_PORT" = "0" ] && return 1
+
+	if [ "$redirect" = "redirect" ]; then
+		set_iptable "$ipv6_server" "$tcp_server"
+	elif [ "$redirect" = "dnsmasq-upstream" ]; then
+		set_forward_dnsmasq "$AdGuardHome_PORT"
+	elif [ "$redirect" = "exchange" ] && [ "$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)" = "53" ]; then
+		use_port53
+	fi
+}
+
+get_filesystem()
+{
+	local path="$1"
+	local mntpt=""
+	local fstype=""
+
+	while IFS= read -r line; do
+		case "$line" in
+		/dev/root|/dev/ubi0*|/dev/mtdblock*)
+			continue
+			;;
+		esac
+		local mp="$(echo "$line" | awk '{print $2}')"
+		local fs="$(echo "$line" | awk '{print $3}')"
+		case "$path" in
+		"$mp"*)
+			fstype="$fs"
+			mntpt="$mp"
+			break
+			;;
+		esac
+	done < /proc/mounts
+
+	if [ -z "$mntpt" ]; then
+		mntpt="/"
+		fstype="$(awk '$2=="/" {print $3}' /proc/mounts)"
+	fi
+
+	echo "$fstype"
+}
+
+config_editor()
+{
+	local yaml="$1"
+	local value="$2"
+	local file="$3"
+	local ro="$4"
+
+	if [ "$ro" = "1" ]; then
+		awk -v yaml="$yaml" '
+		BEGIN {
+			split(yaml, part, "\\.")
+			i = 1
+			l = length(part)
+			s = ""
+		}
+		{
+			if (match($0, s "" part[i] ":")) {
+				if (i == l) {
+					sub(/^[^:]+: */, "")
+					print
+					exit
+				}
+				s = s "[- ]{2}"
+				i++
+			}
+		}' "$file"
+	else
+		# 安全写入：用 sed 只改匹配行，不改其他内容
+		# yaml 路径如 "dns.port" → 匹配带缩进的 "port:" 行
+		local last_key
+		last_key="${yaml##*.}"
+		if grep -qE "^[[:space:]]*${last_key}:" "$file" 2>/dev/null; then
+			sed -i "s|^\\([[:space:]]*${last_key}:\\).*|\\1 ${value}|" "$file"
+		else
+			echo "${last_key}: ${value}" >> "$file"
+		fi
+	fi
 }
 
 boot_service() {
-    rm -f /var/run/AdGserverdis 2>/dev/null
-    config_load "${CONFIGURATION}"
-    config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
-    [ -f "$binpath" ] && start_service
+	rm -f /var/run/AdGserverdis >/dev/null 2>&1
+	config_load "${CONFIGURATION}"
+	config_get waitonboot $CONFIGURATION waitonboot "0"
+	config_get_bool enabled $CONFIGURATION enabled 0
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+
+	[ -f "$binpath" ] && start_service
+
+	if [ "$enabled" = "1" ] && [ "$waitonboot" = "1" ]; then
+		procd_open_instance
+		procd_set_param command "/usr/share/AdGuardHome/waitnet.sh"
+		procd_close_instance
+		echo "AdGuardHome: waiting for network..."
+	fi
+}
+
+testbackup(){
+	config_load "${CONFIGURATION}"
+	if [ "$1" = "backup" ]; then
+		backup
+	elif [ "$1" = "restore" ]; then
+		restore
+	fi
+}
+
+restore()
+{
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+	[ -d "$backupwdpath/data" ] && cp -u -r -f "$backupwdpath/data" "$workdir/"
+}
+
+backup() {
+	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+	mkdir -p "$backupwdpath/data"
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get backupfile $CONFIGURATION backupfile ""
+
+	for one in $backupfile; do
+		while : ; do
+			local cpret
+			if [ -d "$backupwdpath/data/$one" ]; then
+				cpret="$(cp -u -r -f "$workdir/data/$one" "$backupwdpath/data" 2>&1)"
+			else
+				cpret="$(cp -u -r -f "$workdir/data/$one" "$backupwdpath/data/$one" 2>&1)"
+			fi
+			echo "$cpret"
+			echo "$cpret" | grep -q "no space left on device"
+			if [ $? -eq 0 ]; then
+				echo "disk full, deleting querylog and retrying..."
+				del_querylog && continue
+				rm -rf "$backupwdpath/data/filters"
+				rm -rf "$workdir/data/filters" && continue
+				echo "backup failed"
+			fi
+			break
+		done
+	done
 }
 
 start_service() {
-    stop_core || return 1
-    rm -f /var/run/AdGserverdis 2>/dev/null
-    config_load "${CONFIGURATION}"
-    config_get hashpass $CONFIGURATION hashpass ""
-    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-    if [ -n "$hashpass" ]; then
-        config_editor "users.password" "$hashpass" "$configpath"
-        uci set $CONFIGURATION.$CONFIGURATION.hashpass=""
-        uci commit $CONFIGURATION
-    fi
-    local enabled
-    config_get_bool enabled $CONFIGURATION enabled 0
-    if [ "$enabled" = "0" ]; then
-        _do_redirect 0
-        return
-    fi
-    config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome"
+	rm -f /var/run/AdGserverdis >/dev/null 2>&1
+	config_load "${CONFIGURATION}"
 
-    mkdir -p "$workdir/data"
-    local cwdfs
-    cwdfs=$(get_filesystem "$workdir")
-    echo "workdir is a $cwdfs filesystem"
-    if [ "$cwdfs" = "jffs2" ]; then
-        echo "fs error ln db to tmp $workdir $cwdfs"
-        logger "AdGuardHome" "warning db redirect to tmp"
-        touch "$workdir/data/stats.db"
-        if [ ! -L "$workdir/data/stats.db" ]; then
-            mv -f "$workdir/data/stats.db" /tmp/stats.db 2>/dev/null
-            ln -s /tmp/stats.db "$workdir/data/stats.db" 2>/dev/null
-        fi
-        touch "$workdir/data/sessions.db"
-        if [ ! -L "$workdir/data/sessions.db" ]; then
-            mv -f "$workdir/data/sessions.db" /tmp/sessions.db 2>/dev/null
-            ln -s /tmp/sessions.db "$workdir/data/sessions.db" 2>/dev/null
-        fi
-    fi
-    local ADDITIONAL_ARGS=""
-    config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
+	config_get hashpass $CONFIGURATION hashpass ""
+	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
 
-    mkdir -p "${binpath%/*}"
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS -c $configpath"
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS -w $workdir"
-    config_get httpport $CONFIGURATION httpport 3000
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS -p $httpport"
+	if [ -n "$hashpass" ]; then
+		config_editor "users.password" "$hashpass" "$configpath"
+		uci set "$CONFIGURATION"."$CONFIGURATION".hashpass=""
+		uci commit AdGuardHome
+	fi
 
-    printf '%s\n' "$binpath" "$configpath" > /lib/upgrade/keep.d/luci-app-adguardhome
+	local enabled
+	config_get_bool enabled $CONFIGURATION enabled 0
 
-    config_get logfile $CONFIGURATION logfile ""
-    if [ -n "$logfile" ]; then
-        ADDITIONAL_ARGS="$ADDITIONAL_ARGS -l $logfile"
-    fi
+	do_crontab
 
-    if [ ! -f "$binpath" ]; then
-        _do_redirect 0
-        /usr/share/AdGuardHome/update_core.sh >/dev/null 2>&1 &
-        exit 0
-    fi
+	if [ "$enabled" = "0" ]; then
+		_do_redirect 0
+		local binpid
+		config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+		# 用进程名匹配，避免 pgrep -f 自匹配
+		binpid=$(pgrep "${binpath##*/}" 2>/dev/null | head -1)
+		if [ -n "$binpid" ]; then
+			kill -TERM "$binpid" 2>/dev/null
+			sleep 1
+			kill -KILL "$binpid" 2>/dev/null
+		fi
+		return
+	fi
 
-    config_get_bool verbose $CONFIGURATION verbose 0
-    if [ "$verbose" -eq 1 ]; then
-        ADDITIONAL_ARGS="$ADDITIONAL_ARGS -v"
-    fi
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get backupfile $CONFIGURATION backupfile ""
+	mkdir -p "$workdir/data"
 
-    if [ "$(uci -q get bypass.@global[0].global_server)" ] && [ "$(uci -q get bypass.@global[0].adguardhome)" = "1" ] && [ "$(uci -q get dhcp.@dnsmasq[0].port)" = "53" ]; then
-        uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
-        uci -q commit AdGuardHome
-        config_load "${CONFIGURATION}"
-    fi
+	if [ -n "$backupfile" ] && [ ! -d "$workdir/data" ]; then
+		restore
+	fi
 
-    if [ -f "$configpath" ]; then
-        if ! _do_redirect 1 0; then
-            [ "$(config_editor "dns.port" "" "$configpath" "1")" = "0" ] || return 1
-        fi
-    else
-        _do_redirect 0 0
-    fi
+	local cwdfs
+	cwdfs="$(get_filesystem "$workdir")"
+	echo "AdGuardHome: workdir is on $cwdfs filesystem"
+	if [ "$cwdfs" = "jffs2" ]; then
+		logger -t AdGuardHome -p daemon.warn "jffs2 detected, redirecting db to tmp"
+		mkdir -p /tmp/adg_tmp
+		for db in stats.db sessions.db; do
+			touch "$workdir/data/$db"
+			[ ! -L "$workdir/data/$db" ] && mv -f "$workdir/data/$db" "/tmp/adg_tmp/$db" 2>/dev/null
+			[ ! -e "/tmp/adg_tmp/$db" ] && touch "/tmp/adg_tmp/$db"
+			[ -f "/tmp/adg_tmp/$db" ] && ln -sf "/tmp/adg_tmp/$db" "$workdir/data/$db"
+		done
+	fi
 
-    procd_open_instance
-    get_tz
-    if [ -n "$SET_TZ" ]; then
-        procd_set_param env TZ="$SET_TZ"
-    fi
-    procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
-    procd_set_param limits core="unlimited" nofile="65535 65535"
-    procd_set_param stderr 1
-    procd_set_param command "$binpath" $ADDITIONAL_ARGS
-    procd_set_param file "$configpath" "/etc/hosts" "/etc/config/AdGuardHome"
-    procd_close_instance
-    if [ ! -f "$configpath" ]; then
-        config_get "redirect" "AdGuardHome" "redirect" "none"
-        if [ "$redirect" != "none" ]; then
-            procd_open_instance "waitconfig"
-            procd_set_param command "/usr/share/AdGuardHome/watchconfig.sh"
-            procd_close_instance
-            echo "no config start watching"
-        fi
-    fi
-    echo "AdGuardHome service enabled"
-    echo "luci enable switch=$enabled"
+	local ADDITIONAL_ARGS=""
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	mkdir -p "${binpath%/*}"
 
+	ADDITIONAL_ARGS="-c $configpath -w $workdir"
+	config_get httpport $CONFIGURATION httpport 3000
+	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -p $httpport"
+
+	config_get upprotect $CONFIGURATION upprotect ""
+	if [ -n "$upprotect" ]; then
+		{
+			for item in $upprotect; do
+				echo "$item" | sed 's/\\n/\n/g'
+			done
+		} > /lib/upgrade/keep.d/luci-app-adguardhome
+	fi
+
+	config_get logfile $CONFIGURATION logfile ""
+	[ -n "$logfile" ] && ADDITIONAL_ARGS="$ADDITIONAL_ARGS -l $logfile"
+
+	if [ ! -f "$binpath" ]; then
+		_do_redirect 0
+		/usr/share/AdGuardHome/update_core.sh >/tmp/AdGuardHome_update.log 2>&1 &
+		exit 0
+	fi
+
+	config_get_bool verbose $CONFIGURATION verbose 0
+	[ "$verbose" -eq 1 ] && ADDITIONAL_ARGS="$ADDITIONAL_ARGS -v"
+
+	config_get user $CONFIGURATION user ""
+	config_get group $CONFIGURATION group ""
+	config_get gc $CONFIGURATION gc "0"
+	config_get maxprocs $CONFIGURATION maxprocs "0"
+	config_get memlimit $CONFIGURATION memlimit "0"
+
+	procd_open_instance
+	get_tz
+	[ -n "$SET_TZ" ] && procd_set_param env TZ="$SET_TZ"
+	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+	procd_set_param limits core="unlimited" nofile="65535 65535"
+	procd_set_param stderr 1
+	[ -n "$user" ] && procd_set_param user "$user"
+	[ -n "$group" ] && procd_set_param group "$group"
+	[ "$gc" != "0" ] && procd_set_param env GOGC="$gc"
+	[ "$maxprocs" != "0" ] && procd_set_param env GOMAXPROCS="$maxprocs"
+	[ -n "$memlimit" ] && [ "$memlimit" != "0" ] && procd_set_param env GOMEMLIMIT="${memlimit}MiB"
+
+	# DynamicList 写入 uci 是 `list jail_mount '...'` 格式
+	config_list_foreach $CONFIGURATION jail_mount procd_add_jail_mount
+	config_list_foreach $CONFIGURATION jail_mount_rw procd_add_jail_mount_rw
+
+	# 兼容旧的 newline-separated `option jail_mount '...'` 格式（迁移期）
+	local jm jmrw
+	jm="$(uci -q get AdGuardHome.AdGuardHome.jail_mount 2>/dev/null)"
+	case "$jm" in
+		*$'\n'*)
+			printf '%s\n' "$jm" | while IFS= read -r mp; do
+				[ -n "$mp" ] && procd_add_jail_mount "$mp"
+			done
+			;;
+	esac
+	jmrw="$(uci -q get AdGuardHome.AdGuardHome.jail_mount_rw 2>/dev/null)"
+	case "$jmrw" in
+		*$'\n'*)
+			printf '%s\n' "$jmrw" | while IFS= read -r mp; do
+				[ -n "$mp" ] && procd_add_jail_mount_rw "$mp"
+			done
+			;;
+	esac
+
+	procd_set_param command $binpath $ADDITIONAL_ARGS
+	procd_set_param file "$configpath" "/etc/hosts" "/etc/config/AdGuardHome"
+	procd_close_instance
+
+	if [ -f "$configpath" ]; then
+		_do_redirect 1
+	else
+		_do_redirect 0
+		config_get redirect "$CONFIGURATION" redirect "none"
+		if [ "$redirect" != "none" ]; then
+			procd_open_instance
+			procd_set_param command "/usr/share/AdGuardHome/watchconfig.sh"
+			procd_close_instance
+			echo "AdGuardHome: no config found, watching for config file..."
+		fi
+	fi
+
+	echo "AdGuardHome service enabled (switch=$enabled)"
+
+	(sleep 10 && \
+		pgrep "${binpath##*/}" >/dev/null 2>&1 || { \
+			logger -t AdGuardHome "no process found after 10s, canceling redirect"; \
+			_do_redirect 0; \
+		}) &
+
+	local bypass_global="$(uci get bypass.@global[0].global_server 2>/dev/null)"
+	local bypass_adg="$(uci get bypass.@global[0].adguardhome 2>/dev/null)"
+	local dnsmasq_port="$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)"
+	if [ -n "$bypass_global" ] && [ "$bypass_adg" = "1" ] && [ "$dnsmasq_port" = "53" ]; then
+		uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
+		uci commit AdGuardHome
+		do_redirect 1
+	fi
 }
 
-reload_service() {
-    rm -f /var/run/AdGlucitest 2>/dev/null
-    echo "AdGuardHome reloading"
-    start
+reload_service()
+{
+	rm -f /var/run/AdGlucitest >/dev/null 2>&1
+	echo "AdGuardHome reloading"
+	start
 }
 
-stop_service() {
-    stop_core || return 1
-    config_load "${CONFIGURATION}"
-    _do_redirect 0
-    echo "AdGuardHome service disabled"
-    touch /var/run/AdGserverdis
+del_querylog(){
+	local backupwdpath
+	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+	local workdir
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+
+	local btarget
+	btarget="$(ls "$backupwdpath/data" 2>/dev/null | grep "querylog.json" | sort -r | head -n1)"
+	local wtarget
+	wtarget="$(ls "$workdir/data" 2>/dev/null | grep "querylog.json" | sort -r | head -n1)"
+
+	if [ "$btarget" = "$wtarget" ]; then
+		[ -z "$btarget" ] && return 1
+		rm -f "$workdir/data/$wtarget"
+		rm -f "$backupwdpath/data/$btarget"
+		return 0
+	fi
+
+	if [ "$btarget" \> "$wtarget" ]; then
+		rm -f "$backupwdpath/data/$btarget"
+	else
+		rm -f "$workdir/data/$wtarget"
+	fi
+	return 0
+}
+
+stop_service()
+{
+	config_load "${CONFIGURATION}"
+	_do_redirect 0
+	do_crontab
+
+	if [ "$1" != "nobackup" ]; then
+		config_get backupfile $CONFIGURATION backupfile "0"
+		[ -n "$backupfile" ] && backup
+	fi
+
+	echo "AdGuardHome service disabled"
+	touch /var/run/AdGserverdis
 }
 
 boot() {
-    rc_procd boot_service "$@"
-    eval "type service_started" 2>/dev/null >/dev/null && service_started
-}
\ No newline at end of file
+	rc_procd boot_service "$@"
+	if eval "type service_started" 2>/dev/null >/dev/null; then
+		service_started
+	fi
+}
+
+test_crontab(){
+	config_load "${CONFIGURATION}"
+	do_crontab
+}
+
+do_crontab(){
+	config_get_bool enabled $CONFIGURATION enabled 0
+	config_get crontab $CONFIGURATION crontab ""
+	local cronreload=0
+
+	local findstr default cronenable
+	findstr="/usr/share/AdGuardHome/update_core.sh"
+	default="30 3 * * * /usr/share/AdGuardHome/update_core.sh"
+	[ "$enabled" = "0" ] || [ "${crontab//autoupdate/}" = "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+
+	findstr="/usr/share/AdGuardHome/tailto.sh"
+	default="0 * * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
+	[ "$enabled" = "0" ] || [ "${crontab//cutquerylog/}" = "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+
+	findstr="/usr/share/AdGuardHome/tailto.sh"
+	default="30 3 * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.logfile)"
+	[ "$enabled" = "0" ] || [ "${crontab//cutruntimelog/}" = "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+
+	findstr="/usr/share/AdGuardHome/addhost.sh"
+	default="0 * * * * /usr/share/AdGuardHome/addhost.sh"
+	[ "$enabled" = "0" ] || [ "${crontab//autohost/}" = "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+
+	[ "$cronreload" -gt 0 ] && /etc/init.d/cron restart
+}
+
+crontab_editor(){
+	local line
+	local reload
+	line="$(grep "$findstr" "$CRON_FILE" 2>/dev/null)"
+
+	if [ "${line#\#}" != "$line" ]; then
+		if [ "$cronenable" = "1" ]; then
+			sed -i "\|$findstr|d" "$CRON_FILE"
+			echo "${line#\#}" >> "$CRON_FILE"
+			cronreload=$((cronreload + 1))
+		elif [ -z "$reload" ]; then
+			sed -i "\|$findstr|d" "$CRON_FILE"
+			echo "$line" >> "$CRON_FILE"
+		fi
+	else
+		if [ "$cronenable" = "1" ]; then
+			if [ -z "$line" ]; then
+				line="$default"
+				reload=1
+			fi
+			if [ -n "$reload" ]; then
+				sed -i "\|$findstr|d" "$CRON_FILE"
+				echo "$line" >> "$CRON_FILE"
+				cronreload=$((cronreload + 1))
+			fi
+		elif [ -n "$line" ]; then
+			sed -i "\|$findstr|d" "$CRON_FILE"
+			echo "#$line" >> "$CRON_FILE"
+			cronreload=$((cronreload + 1))
+		fi
+	fi
+}
diff --git a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
old mode 100755
new mode 100644
index e736ba60..37e192cd
--- a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
+++ b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
@@ -1,14 +1,15 @@
 #!/bin/sh
-chmod +x /etc/init.d/AdGuardHome
+
 uci -q batch <<-EOF >/dev/null 2>&1
 	delete ucitrack.@AdGuardHome[-1]
 	add ucitrack AdGuardHome
 	set ucitrack.@AdGuardHome[-1].init=AdGuardHome
 	commit ucitrack
+	delete AdGuardHome.AdGuardHome.ucitracktest
+	/etc/init.d/AdGuardHome restart
 EOF
 
-# Remove the former menu and both Lua and ucode menu caches.
-rm -f /usr/share/luci/menu.d/luci-app-adguardhome-js.json
-rm -f /tmp/luci-indexcache /tmp/luci-indexcache.*
-rm -f /tmp/luci-modulecache/*
+rm -f /tmp/luci-indexcache
+
+chmod +x /etc/init.d/AdGuardHome /usr/share/AdGuardHome/*
 exit 0
diff --git a/luci-app-adguardhome/root/usr/lib/lua/luci/i18n/adguardhome.zh-cn.lmo b/luci-app-adguardhome/root/usr/lib/lua/luci/i18n/adguardhome.zh-cn.lmo
new file mode 100644
index 00000000..7c23d77a
Binary files /dev/null and b/luci-app-adguardhome/root/usr/lib/lua/luci/i18n/adguardhome.zh-cn.lmo differ
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml b/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
old mode 100755
new mode 100644
index b6f63852..612a5770
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
@@ -1,123 +1,108 @@
-# 模板用户名为 admin 密码为 admin
-# The username is admin and the password is admin.
-# 保存并应用就可以直接用的配置模板文件
-# a template config can be use with a apply
-http:
-  pprof:
-    port: 6060
-    enabled: false
-  address: 0.0.0.0:3000
-  session_ttl: 720h
+bind_host: 0.0.0.0
+bind_port: 3000
+beta_bind_port: 0
 users:
-  - name: admin
-    password: $2y$10$iGkTW98QtGEZn4I/GC0J4eQhfuLQ53v7L4DDVauEJyWylJrXWwWeO
+- name: root
+  password: $2y$10$dwn0hTYoECQMZETBErGlzOId2VANOVsPHsuH13TM/8KnysM5Dh/ve
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""
-language: ""
-theme: auto
+language: zh-cn
+debug_pprof: false
+web_session_ttl: 720
 dns:
   bind_hosts:
-    - 0.0.0.0
-  port: 3053
+  - 0.0.0.0
+  port: 1745
+  statistics_interval: 30
+  querylog_enabled: true
+  querylog_file_enabled: true
+  querylog_interval: 6h
+  querylog_size_memory: 1000
   anonymize_client_ip: false
-  ratelimit: 20
-  ratelimit_subnet_len_ipv4: 24
-  ratelimit_subnet_len_ipv6: 56
+  protection_enabled: true
+  blocking_mode: default
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_response_ttl: 60
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  ratelimit: 0
   ratelimit_whitelist: []
-  refuse_any: true
+  refuse_any: false
   upstream_dns:
-    - https://dns.cloudflare.com/dns-query
-    - '#'
-    - '# 对 ts.net 相关域名启用 DNS 分流, 交由 Tailscale 解析, 如不使用 Tailscale 可以删除.'
-    - '# Enable DNS conditional forwarding for ts.net via Tailscale; remove if Tailscale is not used.'
-    - '[/ts.net/]100.100.100.100'
+  - 223.5.5.5
   upstream_dns_file: ""
   bootstrap_dns:
-    - 1.1.1.1
-    - 1.0.0.1
-  fallback_dns:
-    - quic://dns.adguard-dns.com
-  upstream_mode: parallel
+  - 119.29.29.29
+  - 223.5.5.5
+  all_servers: false
+  fastest_addr: false
   fastest_timeout: 1s
   allowed_clients: []
   disallowed_clients: []
   blocked_hosts:
-    - version.bind
-    - id.server
-    - hostname.bind
+  - version.bind
+  - id.server
+  - hostname.bind
   trusted_proxies:
-    - 127.0.0.0/8
-    - ::1/128
-  cache_enabled: true
+  - 127.0.0.0/8
+  - ::1/128
   cache_size: 4194304
   cache_ttl_min: 0
   cache_ttl_max: 0
-  cache_optimistic: false
-  cache_optimistic_answer_ttl: 30s
-  cache_optimistic_max_age: 12h
+  cache_optimistic: true
   bogus_nxdomain: []
   aaaa_disabled: false
   enable_dnssec: false
-  edns_client_subnet:
-    custom_ip: ""
-    enabled: false
-    use_custom: false
+  edns_client_subnet: false
   max_goroutines: 300
-  handle_ddr: true
   ipset: []
-  ipset_file: ""
-  bootstrap_prefer_ipv6: false
+  filtering_enabled: true
+  filters_update_interval: 24
+  parental_enabled: false
+  safesearch_enabled: false
+  safebrowsing_enabled: false
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  rewrites: []
+  blocked_services: []
   upstream_timeout: 10s
-  private_networks: []
+  local_domain_name: lan
+  resolve_clients: true
   use_private_ptr_resolvers: true
   local_ptr_upstreams: []
-  use_dns64: false
-  dns64_prefixes: []
-  serve_http3: false
-  use_http3_upstreams: false
-  serve_plain_dns: true
-  hostsfile_enabled: true
-  pending_requests:
-    enabled: true
 tls:
   enabled: false
   server_name: ""
   force_https: false
   port_https: 443
   port_dns_over_tls: 853
-  port_dns_over_quic: 853
+  port_dns_over_quic: 784
   port_dnscrypt: 0
   dnscrypt_config_file: ""
   allow_unencrypted_doh: false
+  strict_sni_check: false
   certificate_chain: ""
   private_key: ""
   certificate_path: ""
   private_key_path: ""
-  strict_sni_check: false
-querylog:
-  dir_path: ""
-  ignored: []
-  interval: 2160h
-  size_memory: 1000
-  enabled: true
-  file_enabled: true
-statistics:
-  dir_path: ""
-  ignored: []
-  interval: 24h
-  enabled: true
 filters:
-  - enabled: true
-    url: https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt
-    name: AdGuard DNS filter
-    id: 1
+- enabled: true
+  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+  name: AdGuard DNS filter
+  id: 1628750870
+- enabled: true
+  url: https://anti-ad.net/easylist.txt
+  name: 'CHN: anti-AD'
+  id: 1628750871
 whitelist_filters: []
 user_rules: []
 dhcp:
   enabled: false
   interface_name: ""
-  local_domain_name: lan
   dhcpv4:
     gateway_ip: ""
     subnet_mask: ""
@@ -131,59 +116,16 @@ dhcp:
     lease_duration: 86400
     ra_slaac_only: false
     ra_allow_slaac: false
-filtering:
-  blocking_ipv4: ""
-  blocking_ipv6: ""
-  blocked_services:
-    schedule:
-      time_zone: UTC
-    ids: []
-  protection_disabled_until: null
-  safe_search:
-    enabled: false
-    bing: true
-    duckduckgo: true
-    ecosia: true
-    google: true
-    pixabay: true
-    yandex: true
-    youtube: true
-  blocking_mode: default
-  parental_block_host: family-block.dns.adguard.com
-  safebrowsing_block_host: standard-block.dns.adguard.com
-  rewrites: []
-  safe_fs_patterns:
-    - /tmp/AdGuardHome/userfilters/*
-  safebrowsing_cache_size: 1048576
-  safesearch_cache_size: 1048576
-  parental_cache_size: 1048576
-  cache_time: 30
-  filters_update_interval: 24
-  blocked_response_ttl: 10
-  filtering_enabled: true
-  rewrites_enabled: true
-  parental_enabled: false
-  safebrowsing_enabled: false
-  protection_enabled: true
-clients:
-  runtime_sources:
-    whois: true
-    arp: true
-    rdns: true
-    dhcp: true
-    hosts: true
-  persistent: []
-log:
-  enabled: true
-  file: ""
-  max_backups: 0
-  max_size: 100
-  max_age: 3
-  compress: false
-  local_time: false
-  verbose: false
+clients: []
+log_compress: false
+log_localtime: false
+log_max_backups: 0
+log_max_size: 100
+log_max_age: 3
+log_file: ""
+verbose: false
 os:
   group: ""
   user: ""
   rlimit_nofile: 0
-schema_version: 32
\ No newline at end of file
+schema_version: 12
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
new file mode 100755
index 00000000..a23a2efc
--- /dev/null
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+checkmd5(){
+	local nowmd5
+	nowmd5="$(md5sum /etc/hosts 2>/dev/null)"
+	nowmd5="${nowmd5%% *}"
+	local lastmd5
+	lastmd5="$(uci get AdGuardHome.AdGuardHome.hostsmd5 2>/dev/null)"
+	if [ "$nowmd5" != "$lastmd5" ]; then
+		uci set AdGuardHome.AdGuardHome.hostsmd5="$nowmd5"
+		uci commit AdGuardHome
+		[ "$1" != "noreload" ] && /etc/init.d/AdGuardHome reload >/dev/null 2>&1
+	fi
+}
+
+if [ "$1" = "del" ]; then
+	sed -i '/programaddstart/,/programaddend/d' /etc/hosts
+	checkmd5 "$2"
+	exit 0
+fi
+
+awk 'BEGIN {
+	dhcp[""] = ""
+}
+{
+	if (FILENAME == "/tmp/dhcp.leases" && (NF >= 4)) {
+		dhcp[$2] = $4
+	}
+}
+END {
+	cmd = "ip -6 neighbor show 2>/dev/null | grep -v fe80"
+	while ((cmd | getline line) > 0) {
+		split(line, f)
+		if (f[5] in dhcp && f[5] != "") {
+			print f[1] " " dhcp[f[5]]
+		}
+	}
+	close(cmd)
+	print "#programaddend"
+}' /tmp/dhcp.leases > /tmp/tmphost 2>/dev/null
+
+grep -q "programaddstart" /etc/hosts 2>/dev/null
+if [ $? -eq 0 ]; then
+	sed -i '/programaddstart/,/programaddend/c\#programaddstart' /etc/hosts
+	sed -i '/programaddstart/r /tmp/tmphost' /etc/hosts
+else
+	{
+		echo "#programaddstart"
+		cat /tmp/tmphost
+	} >> /etc/hosts
+fi
+
+rm -f /tmp/tmphost
+checkmd5 "$2"
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start b/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
new file mode 100644
index 00000000..562117e5
--- /dev/null
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+AdGuardHome_enable=$(uci get AdGuardHome.AdGuardHome.enabled)
+redirect=$(uci get AdGuardHome.AdGuardHome.redirect)
+
+if [ $AdGuardHome_enable -eq 1 -a "$redirect" == "redirect" ]; then
+	/etc/init.d/AdGuardHome do_redirect 1
+fi
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
index e6387b26..908bdf63 100755
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
@@ -4,17 +4,17 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 logread -e AdGuardHome > /tmp/AdGuardHometmp.log
 logread -e AdGuardHome -f >> /tmp/AdGuardHometmp.log &
 pid=$!
-echo "1" > /var/run/AdGuardHomesyslog
+echo "1">/var/run/AdGuardHomesyslog
 while true
 do
 	sleep 12
-	watchdog=$(cat /var/run/AdGuardHomesyslog 2>/dev/null)
-	if [ "${watchdog}x" = "0x" ]; then
-		kill "$pid"
+	watchdog=$(cat /var/run/AdGuardHomesyslog)
+	if [ "$watchdog"x == "0"x ]; then
+		kill $pid
 		rm /tmp/AdGuardHometmp.log
 		rm /var/run/AdGuardHomesyslog
 		exit 0
 	else
-		echo "0" > /var/run/AdGuardHomesyslog
+		echo "0">/var/run/AdGuardHomesyslog
 	fi
-done
\ No newline at end of file
+done
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt b/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
new file mode 100644
index 00000000..e4f1c8fa
--- /dev/null
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
@@ -0,0 +1,3 @@
+https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_${Arch}.tar.gz
+https://github.com/AdguardTeam/AdGuardHome/releases/download/${latest_ver}/AdGuardHome_linux_${Arch}.tar.gz
+https://static.adguard.com/adguardhome/release/AdGuardHome_linux_${Arch}.tar.gz
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
new file mode 100755
index 00000000..9ccc2190
--- /dev/null
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+tail -n $1 "$2" > /var/run/tailtmp
+cat /var/run/tailtmp > "$2"
+rm /var/run/tailtmp
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
index 2be7a26c..1464be6a 100755
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
@@ -1,164 +1,321 @@
 #!/bin/sh
 
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-update_mode=$1
 
-# Keep the lock file: unlinking it would allow a second lock on a new inode.
-exec 9>/var/lock/AdGuardHome-update.lock || exit 1
-# Allow a brief status probe to finish before treating the lock as busy.
-if ! flock -w 1 9; then
-	printf '%s\n' '已经有更新任务正在运行，请等待其结束。'
-	exit 2
-fi
-
-# Only the lock owner may reset the log and update status.
-exec >/tmp/AdGuardHome_update.log 2>&1
-cleanup() {
-	local result=$?
-	trap - EXIT
-	[ "$result" -ne 0 ] && touch /var/run/update_core_error
-	rm -f /var/run/update_core
-	exit "$result"
-}
-trap cleanup EXIT
-trap 'exit 1' TERM INT HUP
-rm -f /var/run/update_core_error
-touch /var/run/update_core
-binpath=$(uci get AdGuardHome.AdGuardHome.binpath 2>/dev/null)
+binpath="$(uci get AdGuardHome.AdGuardHome.binpath 2>/dev/null)"
 if [ -z "$binpath" ]; then
 	uci set AdGuardHome.AdGuardHome.binpath="/tmp/AdGuardHome/AdGuardHome"
 	binpath="/tmp/AdGuardHome/AdGuardHome"
 fi
-[ ! -d "${binpath%/*}" ] && mkdir -p "${binpath%/*}"
-enabled=$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)
-core_api_url="https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest"
 
-Check_Updates(){
-	downloader_cmd="uclient-fetch"
-	downloader_opts="-T 5 -q -O"
-	downloader_quiet_opts="-q -O -"
-	printf "%s\n" "开始检查更新, 请耐心等待 ..."
-	Cloud_Version="$(${downloader_cmd} ${downloader_quiet_opts} "$core_api_url" 2>/dev/null | sed -n 's/.*"tag_name":[ ]*"\(v[^"]*\)".*/\1/p' | head -n 1)"
-	[ -z "$Cloud_Version" ] && printf "\n检查更新失败, 请检查网络或稍后重试!\n" && EXIT 1
-	if [ -f "$binpath" ]; then
-		Current_Version="$($binpath --version 2>/dev/null | sed -n 's/.*\(v[0-9][0-9.]*\).*/\1/p' | head -n 1)"
-	else
-		Current_Version="未知"
-	fi
-	[ -z "$Current_Version" ] && Current_Version="未知"
-	printf "\n执行文件路径: %s\n\n正在检查更新, 请耐心等待 ...\n" "${binpath%/*}"
-	printf "\n当前 AdGuardHome 版本: %s\n云端 AdGuardHome 版本: %s\n" "$Current_Version" "$Cloud_Version"
-	if [ "$Cloud_Version" != "$Current_Version" ] || [ "$1" = force ]; then
-		Update_Core
-	else
-		printf "\n已是最新版本, 无需更新!\n"
-		EXIT 0
-	fi
-	EXIT 0
-}
+mkdir -p "${binpath%/*}"
 
-Update_Core(){
-	rm -rf /tmp/AdGuardHome_Update > /dev/null 2>&1
-	mkdir -p "/tmp/AdGuardHome_Update"
-	GET_Arch
-	link="https://github.com/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz"
-	printf "%s\n" "下载链接:${link}"
-	printf "%s\n" "文件名称:${link##*/}"
-	printf "\n开始下载 AdGuardHome 核心文件 ...\n\n"
-	${downloader_cmd} ${downloader_opts} "/tmp/AdGuardHome_Update/${link##*/}" "$link" > /dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		printf "\nAdGuardHome 核心下载失败，请检查网络、系统时间及 CA 证书 ...\n"
-		rm -rf /tmp/AdGuardHome_Update
-		EXIT 1
-	fi 
-	if [ "${link##*.}" = "gz" ]; then
-		printf "\n正在解压 AdGuardHome ...\n"
-		tar -zxf "/tmp/AdGuardHome_Update/${link##*/}" -C "/tmp/AdGuardHome_Update/"
-		if [ ! -e /tmp/AdGuardHome_Update/AdGuardHome ]
-		then
-			printf "%s\n" "AdGuardHome 核心解压失败!"
-			rm -rf "/tmp/AdGuardHome_Update" > /dev/null 2>&1
-			EXIT 1
-		fi
-		downloadbin="/tmp/AdGuardHome_Update/AdGuardHome/AdGuardHome"
-	else
-		downloadbin="/tmp/AdGuardHome_Update/${link##*/}"
-	fi
-	chmod +x "$downloadbin"
-	size_bytes=$(wc -c < "$downloadbin" 2>/dev/null || echo 0)
-	printf "\nAdGuardHome 核心体积: %s\n" "$(awk -v bytes="$size_bytes" 'BEGIN{printf "%.2fMB", bytes/1000000}')"
-	/etc/init.d/AdGuardHome stop 9>&- > /dev/null 2>&1
-	printf "\n移动 AdGuardHome 核心文件到 %s ...\n" "${binpath%/*}"
-	if ! mv -f "$downloadbin" "$binpath" > /dev/null 2>&1 || [ ! -s "$binpath" ]; then
-		printf "AdGuardHome 核心移动失败!\n可能是设备空间不足导致, 请尝试更改 [执行文件路径] 为 /tmp/AdGuardHome\n"
-		EXIT 1
-	fi
-	rm -rf /tmp/AdGuardHome_Update
-	chmod +x "$binpath"
-	if [ "$enabled" = 1 ]; then
-		printf "\n正在重启 AdGuardHome 服务...\n"
-		/etc/init.d/AdGuardHome restart 9>&- > /dev/null 2>&1
-	fi
-	printf "\nAdGuardHome 核心更新成功!\n"
-}
+upxflag="$(uci get AdGuardHome.AdGuardHome.upxflag 2>/dev/null)"
 
-GET_Arch() {
-	if command -v apk > /dev/null 2>&1; then
-		PM="apk"
-	elif command -v opkg > /dev/null 2>&1; then
-		PM="opkg"
-	else
-		printf "%s\n" "未找到包管理器 (apk/opkg)!" && EXIT 1
-	fi
-	case "${PM}" in
-	apk)
-		Archt="$(apk info -a kernel 2>/dev/null | grep Architecture | awk -F ":[ ]*" '{print $2}')"
-		[ -z "$Archt" ] && Archt="$(uname -m)"
-	;;
-	opkg)
-		Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
-	;;
-	esac
-	case "${Archt}" in
-	i386)
-		Arch=i386
-	;;
-	i686)
-		Arch=i386
-	;;
-	x86|x86_64)
-		Arch=amd64
-	;;
-	mipsel)
-		Arch=mipsle_softfloat
-	;;
-	mips)
-		Arch=mips_softfloat
-	;;
-	mips64el)
-		Arch=mips64le_softfloat
-	;;
-	mips64)
-		Arch=mips64_softfloat
-	;;
-	arm)
-		Arch=arm
-	;;
-	armeb)
-		Arch=armeb
-	;;
-	aarch64)
-		Arch=arm64
-	;;
-	*)
-		printf "\nAdGuardHome 暂不支持当前的设备架构: [%s]!\n" "$Archt"
-		EXIT 1
-	esac
-	printf "\n当前设备架构: %s\n" "$Arch"
-}
-
-EXIT(){
+cleanup() {
+	rm -f /var/run/update_core 2>/dev/null
+	[ "$1" != "0" ] && touch /var/run/update_core_error
 	exit "$1"
 }
 
-Check_Updates "$update_mode"
+check_already_running(){
+	# 先检查锁，再 touch（顺序关键：touch 在函数调用之后执行）
+	if [ -f /var/run/update_core ]; then
+		echo "已有任务在运行，退出"
+		exit 2
+	fi
+}
+
+check_wgetcurl(){
+	if which curl >/dev/null 2>&1; then
+		downloader="curl -L -k --retry 2 --connect-timeout 20 -o"
+		return 0
+	fi
+	if which wget-ssl >/dev/null 2>&1; then
+		downloader="wget-ssl --no-check-certificate -t 2 -T 20 -O"
+		return 0
+	fi
+
+	if [ -z "$1" ]; then
+		opkg update >/dev/null 2>&1 || { echo "错误：opkg 更新失败"; cleanup 1; }
+	fi
+
+	if [ -z "$1" ]; then
+		opkg remove wget wget-nossl --force-depends >/dev/null 2>&1
+		opkg install wget >/dev/null 2>&1 && check_wgetcurl 1 && return 0
+	fi
+
+	if [ "$1" = "1" ]; then
+		opkg install curl >/dev/null 2>&1 && check_wgetcurl 2 && return 0
+	fi
+
+	if [ "$1" = "2" ]; then
+		check_wgetcurl && return 0
+	fi
+
+	echo "错误：缺少 curl 和 wget"
+	cleanup 1
+}
+
+get_arch(){
+	# 尝试多种方式获取架构：opkg → apk → uname -m
+	local a
+	a="$(opkg info kernel 2>/dev/null | grep Architecture | awk '{print $2}')"
+	[ -z "$a" ] && a="$(apk info --architecture 2>/dev/null)"
+	[ -z "$a" ] && a="$(uname -m)"
+	echo "$a"
+}
+
+detect_arch(){
+	local Archt
+	Archt="$(get_arch)"
+
+	case "$Archt" in
+	i386|i686|i386|x86)
+		Arch="386"
+		;;
+	x86_64|x86-64|amd64)
+		Arch="amd64"
+		;;
+	mipsel|mipsle)
+		Arch="mipsle"
+		;;
+	mips64el|mips64le)
+		Arch="mips64le"
+		;;
+	mips)
+		Arch="mips"
+		;;
+	mips64)
+		Arch="mips64"
+		;;
+	arm|armv7*|armv8*)
+		Arch="arm"
+		;;
+	armeb)
+		Arch="armeb"
+		;;
+	aarch64|arm64)
+		Arch="arm64"
+		;;
+	*)
+		echo "错误：不支持的架构：$Archt"
+		cleanup 1
+		;;
+	esac
+}
+
+check_latest_version(){
+	check_wgetcurl
+
+	release_channel="$(uci get AdGuardHome.AdGuardHome.release_channel 2>/dev/null)"
+	[ -z "$release_channel" ] && release_channel="stable"
+
+	if [ "$release_channel" = "beta" ]; then
+		echo "正在检查最新版本（预发布通道）..."
+		# /releases 返回时间倒序的所有 release，含 prerelease。取第一条 = 最新 beta。
+		local api_url="https://api.github.com/repos/AdguardTeam/AdGuardHome/releases"
+	else
+		echo "正在检查最新版本（正式版通道）..."
+		local api_url="https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest"
+	fi
+
+	local api_result
+	api_result="$($downloader - "$api_url" 2>/dev/null)"
+	latest_ver="$(echo "$api_result" | grep -oE '"tag_name": *"v[^"]+"' | head -1 | sed 's/.*"v\(.*\)".*/v\1/')"
+
+	if [ -z "${latest_ver}" ]; then
+		echo "检查最新版本失败，请稍后重试"
+		cleanup 1
+	fi
+
+	if [ -x "$binpath" ]; then
+		now_ver="$($binpath --version 2>/dev/null | grep -oE 'v[0-9.]+(-[A-Za-z0-9.]+)?' | head -1)"
+		[ -z "$now_ver" ] && now_ver="$($binpath -c /dev/null --check-config 2>&1 | grep -oE 'v[0-9.]+(-[A-Za-z0-9.]+)?' | head -1)"
+	else
+		now_ver=""
+	fi
+
+	echo "本地版本：${now_ver:-无}，云端版本：${latest_ver}"
+
+	if [ "$1" = "force" ]; then
+		update_core
+	elif [ -z "$now_ver" ]; then
+		update_core
+	elif [ "$(echo "$latest_ver" | sed 's/[^0-9.]//g')" != "$(echo "$now_ver" | sed 's/[^0-9.]//g')" ]; then
+		# 只有云端版本号严格大于本地时才更新
+		local newer
+		newer="$(printf '%s\n%s' "$latest_ver" "$now_ver" | sed 's/^v//' | sort -Vr | head -1 | sed 's/^/v/')"
+		if [ "$newer" = "$latest_ver" ] && [ "$latest_ver" != "$now_ver" ]; then
+			update_core
+		else
+			echo "已是最新版本（本地版本更高或相同）"
+			cleanup 0
+		fi
+	else
+		echo "已是最新版本"
+		cleanup 0
+	fi
+}
+
+apply_upx(){
+	[ -z "$upxflag" ] && return
+
+	local target="${1:-$binpath}"
+	[ ! -f "$target" ] && return
+
+	local filesize
+	filesize="$(ls -l "$target" 2>/dev/null | awk '{print $5}')"
+	[ -z "$filesize" ] && return
+	[ "$filesize" -le 8000000 ] && return
+
+	echo "二进制文件大于 8MB，正在使用 upx 压缩..."
+	fetch_upx
+
+	local UPX_DIR="/tmp/upx-${upx_ver_nov}-${Arch}_linux"
+	local UPX_BIN="${UPX_DIR}/upx"
+	[ ! -x "$UPX_BIN" ] && { echo "upx 可执行文件未找到"; return; }
+
+	local upx_out="/tmp/AdGuardHomeupdate/upx-packed-$$"
+	$UPX_BIN $upxflag "$target" -o "$upx_out"
+	local upxret=$?
+	rm -rf "$UPX_DIR"
+
+	if [ $upxret -eq 0 ]; then
+		rm -f "$target"
+		mv -f "$upx_out" "$target"
+		chmod 755 "$target"
+		echo "upx 压缩完成"
+	else
+		rm -f "$upx_out"
+	fi
+}
+
+fetch_upx(){
+	local Archt_upx
+	Archt_upx="$(get_arch)"
+
+	case "$Archt_upx" in
+	i386|i686|x86|i386)  Arch="i386";;
+	x86_64|x86-64|amd64) Arch="amd64";;
+	mipsel|mipsle)       Arch="mipsel";;
+	mips64el|mips64le)   Arch="mipsel";;
+	mips)                 Arch="mips";;
+	mips64)               Arch="mips";;
+	arm|armv7*|armv8*)   Arch="arm";;
+	aarch64|arm64)        Arch="arm64";;
+	*)
+		echo "upx：不支持的架构 $Archt_upx"
+		return 1
+		;;
+	esac
+
+	upx_latest_ver="$($downloader - "https://api.github.com/repos/upx/upx/releases/latest" 2>/dev/null | grep -oE '"tag_name": *"[^"]+"' | head -1 | sed 's/.*"\(.*\)"/\1/')"
+
+	if [ -z "$upx_latest_ver" ]; then
+		echo "获取 upx 版本失败"
+		return 1
+	fi
+
+	upx_ver_nov="$(echo "$upx_latest_ver" | sed 's/^v//')"
+	local UPX_TGZ="/tmp/upx-${upx_ver_nov}-${Arch}_linux.tar.xz"
+	local UPX_URL="https://github.com/upx/upx/releases/download/${upx_latest_ver}/upx-${upx_ver_nov}-${Arch}_linux.tar.xz"
+	$downloader "$UPX_TGZ" "$UPX_URL" 2>&1
+	[ $? -ne 0 ] && { echo "upx 下载失败"; return 1; }
+
+	which xz >/dev/null 2>&1 || { opkg install xz >/dev/null 2>&1 || apk add xz >/dev/null 2>&1; } || { echo "xz 不可用"; return 1; }
+
+	xz -d -c "$UPX_TGZ" | tar -x -C "/tmp" >/dev/null 2>&1
+
+	[ ! -x "/tmp/upx-${upx_ver_nov}-${Arch}_linux/upx" ] && { echo "upx 解压失败"; return 1; }
+	rm -f "$UPX_TGZ"
+}
+
+update_core(){
+	echo "正在更新 AdGuardHome 核心..."
+	mkdir -p "/tmp/AdGuardHomeupdate"
+	rm -rf "/tmp/AdGuardHomeupdate/*" 2>/dev/null
+
+	detect_arch
+	echo "架构：$Arch"
+
+	echo "正在获取下载链接..."
+	mkdir -p /tmp/run
+	# 按通道生成下载源：beta 优先 static beta；stable 优先 static release
+	if [ "$release_channel" = "beta" ]; then
+		{
+			echo "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_${Arch}.tar.gz"
+			echo "https://github.com/AdguardTeam/AdGuardHome/releases/download/${latest_ver}/AdGuardHome_linux_${Arch}.tar.gz"
+		} > /tmp/run/AdHlinks.txt
+	else
+		{
+			echo "https://static.adguard.com/adguardhome/release/AdGuardHome_linux_${Arch}.tar.gz"
+			echo "https://github.com/AdguardTeam/AdGuardHome/releases/download/${latest_ver}/AdGuardHome_linux_${Arch}.tar.gz"
+		} > /tmp/run/AdHlinks.txt
+	fi
+
+	local downloadbin=""
+	local success=""
+
+	while read link; do
+		[ -z "$link" ] && continue
+		eval link="$link"
+		echo "尝试下载：$link"
+		$downloader "/tmp/AdGuardHomeupdate/${link##*/}" "$link" 2>&1
+		if [ $? -eq 0 ] && [ -s "/tmp/AdGuardHomeupdate/${link##*/}" ]; then
+			downloadbin="/tmp/AdGuardHomeupdate/${link##*/}"
+			success="1"
+			echo "下载成功"
+			break
+		else
+			echo "下载失败，尝试下一个..."
+			rm -f "/tmp/AdGuardHomeupdate/${link##*/}"
+		fi
+	done < /tmp/run/AdHlinks.txt
+
+	rm -f /tmp/run/AdHlinks.txt
+
+	if [ -z "$success" ]; then
+		echo "错误：所有下载源均失败"
+		cleanup 1
+	fi
+
+	if [ "${downloadbin##*.}" = "gz" ]; then
+		tar -zxf "$downloadbin" -C "/tmp/AdGuardHomeupdate/" 2>/dev/null
+		if [ -d "/tmp/AdGuardHomeupdate/AdGuardHome" ]; then
+			downloadbin="/tmp/AdGuardHomeupdate/AdGuardHome/AdGuardHome"
+		else
+			echo "错误：解压失败"
+			cleanup 1
+		fi
+	fi
+
+	chmod 755 "$downloadbin"
+	echo "下载完成，如已配置 upx 则进行压缩..."
+	apply_upx "$downloadbin"
+
+	echo "正在停止服务..."
+	/etc/init.d/AdGuardHome stop nobackup 2>/dev/null
+
+	echo "正在安装新二进制文件..."
+	rm -f "$binpath" 2>/dev/null
+	mv -f "$downloadbin" "$binpath" 2>/dev/null
+	[ $? -ne 0 ] && { echo "mv 失败 - 磁盘空间不足？"; cleanup 1; }
+	chmod 755 "$binpath"
+
+	rm -rf "/tmp/AdGuardHomeupdate" 2>/dev/null
+
+	echo "正在启动服务..."
+	/etc/init.d/AdGuardHome start 2>/dev/null
+
+	echo "AdGuardHome 已成功更新至 ${latest_ver}"
+	cleanup 0
+}
+
+trap "cleanup 1" SIGTERM SIGINT
+
+check_already_running
+touch /var/run/update_core
+rm -f /var/run/update_core_error 2>/dev/null
+
+check_latest_version "$1"
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
new file mode 100755
index 00000000..d45518af
--- /dev/null
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+
+count=0
+while :; do
+	for host in www.baidu.com 223.5.5.5 www.google.com 8.8.8.8; do
+		ping -c 1 -W 2 -q "$host" >/dev/null 2>&1
+		if [ $? -eq 0 ]; then
+			/etc/init.d/AdGuardHome force_reload
+			exit 0
+		fi
+	done
+
+	count=$((count + 1))
+	if [ $count -gt 18 ]; then
+		/etc/init.d/AdGuardHome force_reload
+		exit 0
+	fi
+	sleep 5
+done
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh b/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
index f6850663..61ba09de 100755
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
@@ -10,4 +10,4 @@ do
 		break
 	fi
 done
-exit 0
\ No newline at end of file
+return 0
diff --git a/luci-app-adguardhome/root/usr/share/luci/menu.d/luci-app-adguardhome.json b/luci-app-adguardhome/root/usr/share/luci/menu.d/luci-app-adguardhome.json
index 6cdcf8bb..189428c2 100644
--- a/luci-app-adguardhome/root/usr/share/luci/menu.d/luci-app-adguardhome.json
+++ b/luci-app-adguardhome/root/usr/share/luci/menu.d/luci-app-adguardhome.json
@@ -1,45 +1,53 @@
 {
-        "admin/services/AdGuardHome": {
-                "title": "AdGuard Home",
-                "order": 12,
-                "action": {
-                        "type": "firstchild"
-                },
-                "depends": {
-                        "acl": [ "luci-app-adguardhome" ]
-                }
-        },
-        "admin/services/AdGuardHome/base": {
-                "title": "Base Setting",
-                "order": 1,
-                "action": {
-                        "type": "view",
-                        "path": "adguardhome/base"
-                },
-                "depends": {
-                        "acl": [ "luci-app-adguardhome" ]
-                }
-        },
-        "admin/services/AdGuardHome/log": {
-                "title": "Log",
-                "order": 3,
-                "action": {
-                        "type": "view",
-                        "path": "adguardhome/log"
-                },
-                "depends": {
-                        "acl": [ "luci-app-adguardhome" ]
-                }
-        },
-        "admin/services/AdGuardHome/manual": {
-                "title": "Manual Config",
-                "order": 2,
-                "action": {
-                        "type": "view",
-                        "path": "adguardhome/manual"
-                },
-                "depends": {
-                        "acl": [ "luci-app-adguardhome" ]
-                }
-        }
+	"admin/services/AdGuardHome": {
+		"title": "AdGuard Home",
+		"order": 10,
+		"action": {
+			"type": "alias",
+			"path": "admin/services/AdGuardHome/overview"
+		},
+		"depends": {
+			"acl": [ "luci-app-adguardhome" ]
+		}
+	},
+	"admin/services/AdGuardHome/overview": {
+		"title": "概览",
+		"order": 1,
+		"action": {
+			"type": "cbi",
+			"path": "AdGuardHome/overview"
+		}
+	},
+	"admin/services/AdGuardHome/base": {
+		"title": "基础设置",
+		"order": 2,
+		"action": {
+			"type": "cbi",
+			"path": "AdGuardHome/base"
+		}
+	},
+	"admin/services/AdGuardHome/tools": {
+		"title": "运维",
+		"order": 3,
+		"action": {
+			"type": "cbi",
+			"path": "AdGuardHome/tools"
+		}
+	},
+	"admin/services/AdGuardHome/log": {
+		"title": "日志",
+		"order": 4,
+		"action": {
+			"type": "form",
+			"path": "AdGuardHome/log"
+		}
+	},
+	"admin/services/AdGuardHome/manual": {
+		"title": "手动配置",
+		"order": 5,
+		"action": {
+			"type": "cbi",
+			"path": "AdGuardHome/manual"
+		}
+	}
 }
diff --git a/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json b/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
index 41727fce..485aa620 100644
--- a/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
+++ b/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
@@ -2,20 +2,10 @@
 	"luci-app-adguardhome": {
 		"description": "Grant UCI access for luci-app-adguardhome",
 		"read": {
-			"file": {
-				"/var/run/AdGredir": [ "read" ]
-			},
-			"ubus": {
-				"service": [ "list" ],
-				"luci.adguardhome": [ "getCoreInfo", "getRedirectStatus", "getCoreUpdate", "getInterfaces", "getRuntimeLog", "getManualConfig" ]
-			},
 			"uci": [ "AdGuardHome" ]
 		},
 		"write": {
-			"ubus": {
-				"luci.adguardhome": [ "setVerboseLog", "startCoreUpdate", "changeWebPassword", "clearRuntimeLog", "setManualConfig" ]
-			},
 			"uci": [ "AdGuardHome" ]
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
new file mode 100644
index 00000000..f93d42b7
--- /dev/null
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
@@ -0,0 +1 @@
+!function(n){"object"==typeof exports&&"object"==typeof module?n(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],n):n(CodeMirror)}(function(n){"use strict";function e(e,o,i,t){if(i&&i.call){var l=i;i=null}else l=r(e,i,"rangeFinder");"number"==typeof o&&(o=n.Pos(o,0));var f=r(e,i,"minFoldSize");function d(n){var r=l(e,o);if(!r||r.to.line-r.from.linee.firstLine();)o=n.Pos(o.line-1,0),u=d(!1);if(u&&!u.cleared&&"unfold"!==t){var a=function(n,e){var o=r(n,e,"widget");if("string"==typeof o){var i=document.createTextNode(o);(o=document.createElement("span")).appendChild(i),o.className="CodeMirror-foldmarker"}else o&&(o=o.cloneNode(!0));return o}(e,i);n.on(a,"mousedown",function(e){c.clear(),n.e_preventDefault(e)});var c=e.markText(u.from,u.to,{replacedWith:a,clearOnEnter:r(e,i,"clearOnEnter"),__isFold:!0});c.on("clear",function(o,r){n.signal(e,"unfold",e,o,r)}),n.signal(e,"fold",e,u.from,u.to)}}n.newFoldFunction=function(n,o){return function(r,i){e(r,i,{rangeFinder:n,widget:o})}},n.defineExtension("foldCode",function(n,o,r){e(this,n,o,r)}),n.defineExtension("isFolded",function(n){for(var e=this.findMarksAt(n),o=0;o=u){if(s&&f&&s.test(f.className))return;i=r(a.indicatorOpen)}}(i||f)&&t.setGutterMarker(n,a.gutter,i)})}function i(t){return new RegExp("(^|\\s)"+t+"(?:$|\\s)\\s*")}function f(t){var o=t.getViewport(),e=t.state.foldGutter;e&&(t.operation(function(){n(t,o.from,o.to)}),e.from=o.from,e.to=o.to)}function a(t,r,n){var i=t.state.foldGutter;if(i){var f=i.options;if(n==f.gutter){var a=e(t,r);a?a.clear():t.foldCode(o(r,0),f)}}}function d(t){var o=t.state.foldGutter;if(o){var e=o.options;o.from=o.to=0,clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){f(t)},e.foldOnChangeTimeSpan||600)}}function u(t){var o=t.state.foldGutter;if(o){var e=o.options;clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){var e=t.getViewport();o.from==o.to||e.from-o.to>20||o.from-e.to>20?f(t):t.operation(function(){e.fromo.to&&(n(t,o.to,e.to),o.to=e.to)})},e.updateViewportTimeSpan||400)}}function l(t,o){var e=t.state.foldGutter;if(e){var r=o.line;r>=e.from&&ro))break;r=l}}return r?{from:e.Pos(i.line,t.getLine(i.line).length),to:e.Pos(r,t.getLine(r).length)}:void 0}})});
\ No newline at end of file
diff --git a/luci-app-adguardhome/po/zh-cn/AdGuardHome.po b/po/zh-cn/AdGuardHome.po
similarity index 100%
rename from luci-app-adguardhome/po/zh-cn/AdGuardHome.po
rename to po/zh-cn/AdGuardHome.po
diff --git a/root/etc/config/AdGuardHome b/root/etc/config/AdGuardHome
new file mode 100644
index 00000000..fb562bb1
--- /dev/null
+++ b/root/etc/config/AdGuardHome
@@ -0,0 +1,11 @@
+
+config AdGuardHome 'AdGuardHome'
+	option enabled '0'
+	option httpport '3000'
+	option redirect 'none'
+	option configpath '/etc/AdGuardHome.yaml'
+	option workdir '/tmp/AdGuardHome'
+	option logfile '/tmp/AdGuardHome.log'
+	option verbose '0'
+	option binpath '/usr/bin/AdGuardHome/AdGuardHome'
+	list wan_ifname 'eth0'
diff --git a/root/etc/init.d/AdGuardHome b/root/etc/init.d/AdGuardHome
new file mode 100755
index 00000000..dfa233b6
--- /dev/null
+++ b/root/etc/init.d/AdGuardHome
@@ -0,0 +1,653 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+
+START=95
+STOP=01
+
+CONFIGURATION=AdGuardHome
+NFT_RULES_FILE="/var/etc/adguardhome.nft"
+NFT_RULES_TPL="/usr/share/AdGuardHome/adguardhome.nft.tpl"
+NFT_TABLE="adguardhome"
+
+EXTRA_COMMANDS="do_redirect force_reload isrunning"
+EXTRA_HELP="        do_redirect 0 or 1\
+		force_reload
+		isrunning"
+
+get_wan_return_line() {
+    local wan
+    wan="$(uci -q get AdGuardHome.AdGuardHome.wan_ifname 2>/dev/null)"
+
+    [ -z "$wan" ] && { echo ""; return 0; }
+
+    local wan_set
+    wan_set="\"$(printf '%s' "$wan" | sed 's/ /\", \"/g')\""
+    echo "iifname { $wan_set } return"
+}
+
+set_nft_redirect() {
+    local port="$1"
+    case "$port" in
+        *[!0-9]*|"") return 1 ;;
+    esac
+    [ ! -f "$NFT_RULES_TPL" ] && return 1
+
+    local return_line
+    return_line="$(get_wan_return_line)"
+
+    awk -v port="$port" -v wan_line="$return_line" '{
+        gsub("__AGH_PORT__", port)
+        gsub("__AGH_WAN_RETURN_LINE__", wan_line)
+        print
+    }' "$NFT_RULES_TPL" > "$NFT_RULES_FILE" || return 1
+
+    [ ! -s "$NFT_RULES_FILE" ] && return 1
+
+    nft delete table inet "$NFT_TABLE" 2>/dev/null
+    nft -f "$NFT_RULES_FILE" 2>/dev/null
+}
+
+clear_nft_redirect() {
+    uci -q delete firewall.adguardhome_nft_include
+    uci -q commit firewall
+
+    [ -f "$NFT_RULES_FILE" ] && rm -f "$NFT_RULES_FILE"
+    nft delete table inet "$NFT_TABLE" 2>/dev/null
+}
+
+wait_for_pid_exit() {
+    local pid="$1" attempts=0
+    case "$pid" in ''|*[!0-9]*) return 0 ;; esac
+    while kill -0 "$pid" 2>/dev/null; do
+        [ "$attempts" -lt 15 ] || return 1
+        sleep 1
+        attempts=$((attempts + 1))
+    done
+}
+
+wait_for_dns_port_release() {
+    local port="$1" attempts=0 tables="" table busy
+    for table in /proc/net/tcp /proc/net/tcp6 /proc/net/udp /proc/net/udp6; do
+        [ -r "$table" ] && tables="$tables $table"
+    done
+    [ -n "$tables" ] || return 1
+    port="$(printf '%04X' "$port")" || return 1
+    while :; do
+        busy="$(awk -v port="$port" '
+            FNR > 1 {
+                split($2, address, ":")
+                if (toupper(address[2]) == port &&
+                    ((FILENAME ~ /tcp/ && $4 == "0A") ||
+                     (FILENAME ~ /udp/ && $4 == "07"))) found = 1
+            }
+            END { print found ? 1 : 0 }
+        ' $tables)" || return 1
+        [ "$busy" = "0" ] && return 0
+        [ "$attempts" -lt 15 ] || return 1
+        sleep 1
+        attempts=$((attempts + 1))
+    done
+}
+
+restart_dnsmasq() {
+    local released_port="$1" service pids pid
+    service="$(ubus call service list '{"name":"dnsmasq"}' 2>/dev/null)" || return 1
+    pids="$(printf '%s' "$service" | jsonfilter -e '@.dnsmasq.instances.*.pid')"
+    /etc/init.d/dnsmasq stop 8>&- 1000>&- || return 1
+    for pid in $pids; do
+        if ! wait_for_pid_exit "$pid"; then
+            logger -t AdGuardHome 'dnsmasq did not stop; refusing to reuse its old jail.'
+            return 1
+        fi
+    done
+    if [ -n "$released_port" ] && ! wait_for_dns_port_release "$released_port"; then
+        logger -t AdGuardHome "DNS port $released_port is still occupied after stopping dnsmasq."
+        /etc/init.d/dnsmasq start 8>&- 1000>&-
+        return 1
+    fi
+    /etc/init.d/dnsmasq start 8>&- 1000>&- || return 1
+    if [ -n "$released_port" ] && ! wait_for_dns_port_release "$released_port"; then
+        logger -t AdGuardHome "DNS port $released_port was occupied again after starting dnsmasq."
+        return 1
+    fi
+    return 0
+}
+
+save_dnsmasq_upstream_config() {
+    local backup="AdGuardHome.dnsmasq_backup" option value server
+    [ "$(uci -q get "$backup.ready")" = "1" ] && return 0
+
+    uci -q delete "$backup"
+    uci set "$backup=dnsmasq_backup" || return 1
+    value="$(uci -q get dhcp.@dnsmasq[0].server)"
+    for server in $value; do
+        uci add_list "$backup.server=$server" || return 1
+    done
+    for option in resolvfile noresolv; do
+        if value="$(uci -q get "dhcp.@dnsmasq[0].$option")"; then
+            uci set "$backup.$option=$value" || return 1
+        fi
+    done
+    uci set "$backup.ready=1" || return 1
+    if ! uci commit AdGuardHome; then
+        uci -q revert "$backup"
+        return 1
+    fi
+}
+
+apply_dnsmasq_config() {
+    [ "${AGH_DEFER_DNSMASQ_RESTART:-0}" = "1" ] && return 0
+    restart_dnsmasq "$@"
+}
+
+is_scoped_dnsmasq_server() {
+    local domains="${1%/*}"
+    case "$1" in
+        /*) case "$domains/" in */\#/*) return 1 ;; esac; return 0 ;;
+    esac
+    return 1
+}
+
+set_forward_dnsmasq() (
+    set -f
+    local addr="127.0.0.1#$1" servers desired server
+
+    if [ "$(uci -q get AdGuardHome.dnsmasq_backup.ready)" != "1" ] &&
+       [ "$2" = "dnsmasq-upstream" ] && [ "$3" = "1" ]; then
+        stop_forward_dnsmasq "$4" || return 1
+    fi
+    save_dnsmasq_upstream_config || return 1
+
+    servers="$(uci -q get dhcp.@dnsmasq[0].server)"
+    desired="$addr"
+    for server in $servers; do
+        is_scoped_dnsmasq_server "$server" && desired="$desired $server"
+    done
+    if [ "$servers" = "$desired" ] && [ "$(uci -q get dhcp.@dnsmasq[0].noresolv)" = "1" ]; then
+        return 0
+    fi
+
+    uci -q delete dhcp.@dnsmasq[0].server
+    for server in $desired; do
+        uci add_list "dhcp.@dnsmasq[0].server=$server" || return 1
+    done
+    uci set dhcp.@dnsmasq[0].noresolv=1 || return 1
+    uci commit dhcp || return 1
+    apply_dnsmasq_config >/dev/null 2>&1
+)
+
+stop_forward_dnsmasq() (
+    set -f
+    local backup="AdGuardHome.dnsmasq_backup" option value server
+    local addr="127.0.0.1#$1" found=0 has_general=0
+
+    if [ "$(uci -q get "$backup.ready")" = "1" ]; then
+        uci -q delete dhcp.@dnsmasq[0].server
+        value="$(uci -q get "$backup.server")"
+        for server in $value; do
+            uci add_list "dhcp.@dnsmasq[0].server=$server" || return 1
+        done
+        for option in resolvfile noresolv; do
+            if value="$(uci -q get "$backup.$option")"; then
+                uci set "dhcp.@dnsmasq[0].$option=$value" || return 1
+            else
+                uci -q delete "dhcp.@dnsmasq[0].$option"
+            fi
+        done
+        uci commit dhcp || return 1
+        apply_dnsmasq_config >/dev/null 2>&1 || return 1
+        [ "${AGH_DEFER_DNSMASQ_RESTART:-0}" = "1" ] && return 0
+        uci -q delete "$backup"
+        uci commit AdGuardHome
+        return $?
+    fi
+
+    value="$(uci -q get dhcp.@dnsmasq[0].server)"
+    for server in $value; do
+        if [ "$server" = "$addr" ]; then
+            found=1
+        elif ! is_scoped_dnsmasq_server "$server"; then
+            has_general=1
+        fi
+    done
+    [ "$found" = "1" ] || return 0
+    uci -q del_list "dhcp.@dnsmasq[0].server=$addr" || return 1
+    if [ "$has_general" = "0" ]; then
+        if ! uci -q get dhcp.@dnsmasq[0].resolvfile >/dev/null; then
+            value="/tmp/resolv.conf.d/resolv.conf.auto"
+            [ -f "$value" ] || value="/tmp/resolv.conf.auto"
+            uci set "dhcp.@dnsmasq[0].resolvfile=$value" || return 1
+        fi
+        uci -q delete dhcp.@dnsmasq[0].noresolv
+    fi
+    logger -t AdGuardHome 'No DNS snapshot from previous version; removed old upstream, original resolver settings are unavailable.'
+    uci commit dhcp || return 1
+    apply_dnsmasq_config >/dev/null 2>&1
+)
+
+stop_core() {
+    local service instance pid
+    service="$(ubus call service list '{"name":"AdGuardHome"}' 2>/dev/null)" || return 1
+    instance="$(printf '%s' "$service" | jsonfilter -e '@.AdGuardHome.instances.instance1')"
+    [ -n "$instance" ] || return 0
+    pid="$(printf '%s' "$instance" | jsonfilter -e '@.pid')"
+    ubus call service delete '{"name":"AdGuardHome","instance":"instance1"}' >/dev/null || return 1
+    if ! wait_for_pid_exit "$pid"; then
+        logger -t AdGuardHome 'Core did not stop; DNS port settings were not changed.'
+        return 1
+    fi
+}
+
+agh_reload() {
+    [ "${AGH_REDIRECT_RELOAD:-1}" = "1" ] || return 0
+    if [ "${AGH_DEFER_DNSMASQ_RESTART:-0}" = "1" ]; then
+        AGH_RELOAD_PENDING=1
+        return 0
+    fi
+    ubus call service event '{"type":"config.change","data":{"package":"AdGuardHome"}}' >/dev/null 2>&1
+}
+
+rm_port53() {
+    local configpath
+    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+
+    local AdGuardHome_PORT dnsmasq_port
+    AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
+    dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
+    [ -z "$dnsmasq_port" ] && dnsmasq_port="53"
+
+    if [ "$dnsmasq_port" = "$AdGuardHome_PORT" ]; then
+        [ "$dnsmasq_port" = "53" ] && dnsmasq_port="1745"
+    elif [ "$dnsmasq_port" = "53" ]; then
+        return
+    fi
+
+    stop_core || return 1
+    config_editor "dns.port" "$dnsmasq_port" "$configpath"
+    [ "$(config_editor "dns.port" "" "$configpath" "1")" = "$dnsmasq_port" ] || return 1
+    uci set dhcp.@dnsmasq[0].port="53" || return 1
+    uci commit dhcp || return 1
+    apply_dnsmasq_config "$dnsmasq_port" || return 1
+    agh_reload
+}
+
+use_port53() {
+    local configpath
+    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+
+    local AdGuardHome_PORT dnsmasq_port
+    AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
+    dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
+    [ -z "$dnsmasq_port" ] && dnsmasq_port="53"
+
+    if [ "$dnsmasq_port" = "$AdGuardHome_PORT" ]; then
+        [ "$dnsmasq_port" = "53" ] && AdGuardHome_PORT="1745"
+    elif [ "$AdGuardHome_PORT" = "53" ]; then
+        return
+    fi
+
+    stop_core || return 1
+    config_editor "dns.port" "53" "$configpath"
+    [ "$(config_editor "dns.port" "" "$configpath" "1")" = "53" ] || return 1
+    uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT" || return 1
+    uci commit dhcp || return 1
+    apply_dnsmasq_config "$dnsmasq_port" || return 1
+    agh_reload
+}
+
+mark_redirect_flag() {
+    local enabled="$1" redirect="$2" agh_port="$3"
+
+    local configpath
+    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+
+    local flag=0
+
+    if [ "$enabled" = "1" ] && [ "$redirect" != "none" ]; then
+        flag=1
+
+        if [ "$redirect" = "redirect" ]; then
+            nft list table inet "$NFT_TABLE" >/dev/null 2>&1 || flag=0
+
+        elif [ "$redirect" = "dnsmasq-upstream" ]; then
+            local s
+            s="$(uci -q get dhcp.@dnsmasq[0].server | tr '\n' ' ')"
+            printf '%s\n' "$s" | grep -q -E "(^|[[:space:]])127\.0\.0\.1#${agh_port}([[:space:]]|$)" || flag=0
+
+        elif [ "$redirect" = "exchange" ]; then
+            local cfgp dport
+            cfgp="$(config_editor "dns.port" "" "$configpath" "1")"
+            dport="$(uci -q get dhcp.@dnsmasq[0].port)"
+            if [ "$cfgp" != "53" ] || [ "$dport" = "53" ] ; then
+                flag=0
+            fi
+        fi
+    fi
+
+    echo -n "$flag" > /var/run/AdGredir
+}
+
+finish_dnsmasq_config() {
+    case "$old_redirect:$redirect" in
+        *dnsmasq-upstream*|*exchange*)
+            if [ "$dnsmasq_before" != "$(uci -q export dhcp)" ] || [ "$previous_flag" != "1" ] || [ "$enabled" = "0" ]; then
+                local released_port=""
+                if [ "$enabled" = "1" ] && [ "$redirect" = "exchange" ]; then
+                    released_port=53
+                elif [ "$dnsmasq_previous_port" != "$(uci -q get dhcp.@dnsmasq[0].port)" ]; then
+                    released_port="$dnsmasq_previous_port"
+                fi
+                restart_dnsmasq "$released_port" || return 1
+            fi
+            ;;
+    esac
+    if { [ "$enabled" = "0" ] || [ "$redirect" != "dnsmasq-upstream" ]; } &&
+       [ "$(uci -q get AdGuardHome.dnsmasq_backup.ready)" = "1" ]; then
+        uci -q delete AdGuardHome.dnsmasq_backup
+        uci commit AdGuardHome || return 1
+    fi
+    return 0
+}
+
+_do_redirect() (
+    exec 8>/var/lock/AdGuardHome-redirect.lock || return 1
+    flock -w 10 8 || return 1
+    local AGH_DEFER_DNSMASQ_RESTART=1 AGH_RELOAD_PENDING=0
+    local dnsmasq_before dnsmasq_previous_port previous_flag
+    dnsmasq_before="$(uci -q export dhcp)" || return 1
+    dnsmasq_previous_port="$(uci -q get dhcp.@dnsmasq[0].port)"
+    dnsmasq_previous_port="${dnsmasq_previous_port:-53}"
+    previous_flag="$(cat /var/run/AdGredir 2>/dev/null)"
+    echo -n "0" > /var/run/AdGredir
+    local section="$CONFIGURATION"
+    args=""
+    ipv6_server=1
+    tcp_server=0
+    enabled="$1"
+    AGH_REDIRECT_RELOAD="${2:-$enabled}"
+
+    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+    AdGuardHome_PORT="$(config_editor "dns.port" "" "$configpath" "1")"
+    [ -z "$AdGuardHome_PORT" ] && AdGuardHome_PORT="0"
+
+    config_get redirect      "$section" redirect      "none"
+    config_get old_redirect  "$section" old_redirect  "none"
+    config_get old_port      "$section" old_port      "0"
+    config_get old_enabled   "$section" old_enabled   "0"
+
+    uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1
+    uci commit dhcp
+
+    if [ "$old_enabled" = "1" ] && [ "$old_redirect" = "exchange" ]; then
+        AdGuardHome_PORT="$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)"
+    fi
+
+    if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$AdGuardHome_PORT" ] || { [ "$old_enabled" = "1" ] && [ "$enabled" = "0" ]; }; then
+        if [ "$old_redirect" != "none" ]; then
+            if [ "$old_redirect" = "redirect" ] && [ "$old_port" != "0" ]; then
+                clear_nft_redirect
+            elif [ "$old_redirect" = "dnsmasq-upstream" ]; then
+                if [ "$old_enabled" = "1" ] || [ "$(uci -q get AdGuardHome.dnsmasq_backup.ready)" = "1" ]; then
+                    if ! stop_forward_dnsmasq "$old_port"; then
+                        echo -n "0" > /var/run/AdGredir
+                        return 1
+                    fi
+                fi
+                old_enabled=0
+            elif [ "$old_redirect" = "exchange" ]; then
+                if ! rm_port53; then
+                    echo -n "0" > /var/run/AdGredir
+                    return 1
+                fi
+            fi
+        fi
+    elif [ "$old_enabled" = "1" ] && [ "$enabled" = "1" ]; then
+        if [ "$old_redirect" = "redirect" ] && [ "$old_port" != "0" ]; then
+            clear_nft_redirect
+        fi
+    fi
+
+    uci delete AdGuardHome.@AdGuardHome[0].old_redirect 2>/dev/null
+    uci delete AdGuardHome.@AdGuardHome[0].old_port 2>/dev/null
+    uci delete AdGuardHome.@AdGuardHome[0].old_enabled 2>/dev/null
+    uci add_list AdGuardHome.@AdGuardHome[0].old_redirect="$redirect" 2>/dev/null
+    uci add_list AdGuardHome.@AdGuardHome[0].old_port="$AdGuardHome_PORT" 2>/dev/null
+    uci add_list AdGuardHome.@AdGuardHome[0].old_enabled="$enabled" 2>/dev/null
+    uci commit AdGuardHome
+
+    if [ "$enabled" = "0" ] || [ "$AdGuardHome_PORT" = "0" ]; then
+        finish_dnsmasq_config || return 1
+        echo -n "0" > /var/run/AdGredir
+        return 1
+    fi
+
+    if [ "$redirect" = "redirect" ]; then
+        set_nft_redirect "$AdGuardHome_PORT"
+    elif [ "$redirect" = "dnsmasq-upstream" ]; then
+        if ! set_forward_dnsmasq "$AdGuardHome_PORT" "$old_redirect" "$old_enabled" "$old_port"; then
+            echo -n "0" > /var/run/AdGredir
+            return 1
+        fi
+    elif [ "$redirect" = "exchange" ] && [ "$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)" = "53" ]; then
+        if ! use_port53; then
+            echo -n "0" > /var/run/AdGredir
+            return 1
+        fi
+    fi
+
+    finish_dnsmasq_config || return 1
+    mark_redirect_flag "$enabled" "$redirect" "$AdGuardHome_PORT" || return 1
+    AGH_DEFER_DNSMASQ_RESTART=0
+    [ "$AGH_RELOAD_PENDING" = "0" ] || agh_reload
+    return 0
+)
+
+do_redirect() {
+    config_load "${CONFIGURATION}"
+    _do_redirect "$1"
+}
+
+service_triggers() {
+    procd_add_reload_trigger "$CONFIGURATION"
+}
+
+isrunning() {
+    config_load "${CONFIGURATION}"
+    _isrunning
+    local r=$?
+    [ "$r" = "0" ] && echo "running" || ([ "$r" = "1" ] && echo "not run" || echo "no bin")
+    return $r
+}
+
+_isrunning() {
+    config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
+    [ ! -f "$binpath" ] && return 2
+    pgrep -f "$(basename "$binpath")" >/dev/null 2>&1 && return 0
+    return 1
+}
+
+force_reload() {
+    config_load "${CONFIGURATION}"
+    _isrunning && procd_send_signal "$CONFIGURATION" || start
+}
+
+get_tz() {
+    SET_TZ=""
+    [ -e "/etc/localtime" ] && return
+    for tzfile in /etc/TZ /var/etc/TZ; do
+        [ -e "$tzfile" ] && tz="$(cat "$tzfile" 2>/dev/null)" && break
+    done
+    [ -n "$tz" ] && SET_TZ=$tz
+}
+
+get_filesystem() {
+    echo "$1" | awk '
+    BEGIN{
+        while (("mount"| getline ret) > 0) {
+            split(ret,d); fs[d[3]]=d[5];
+            m=index(d[1],":");
+            if (m==0) { pt[d[3]]=d[1] } else { pt[d[3]]=substr(d[1],m+1) }
+        }
+    }
+    {
+        split($0,d,"/");
+        if ("/" in fs) { result1=fs["/"]; }
+        if ("/" in pt) { result2=pt["/"]; }
+        for (i=2;i<=length(d);i++) {
+           p[i]=p[i-1]"/"d[i];
+           if (p[i] in fs) { result1=fs[p[i]]; result2=pt[p[i]]; }
+        }
+        if (result2 in fs) { result=fs[result2] } else { result=result1 }
+        print(result);
+    }'
+}
+
+config_editor() {
+    awk -v yaml="$1" -v value="$2" -v file="$3" -v ro="$4" '
+    BEGIN{split(yaml,part,"\.");s="";i=1;l=length(part);}
+    {
+        if (match($0,s""part[i]":")) {
+            if (i==l) {
+                split($0,t,": ");
+                if (ro==""){
+                    system("sed -i '\''"FNR"c\\" t[1] ": " value "'\'' " file);
+                } else {
+                    print(t[2]);
+                }
+                exit;
+            }
+            s=s"[- ]{2}";
+            i++;
+        }
+    }' "$3"
+}
+
+boot_service() {
+    rm -f /var/run/AdGserverdis 2>/dev/null
+    config_load "${CONFIGURATION}"
+    config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
+    [ -f "$binpath" ] && start_service
+}
+
+start_service() {
+    stop_core || return 1
+    rm -f /var/run/AdGserverdis 2>/dev/null
+    config_load "${CONFIGURATION}"
+    config_get hashpass $CONFIGURATION hashpass ""
+    config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+    if [ -n "$hashpass" ]; then
+        config_editor "users.password" "$hashpass" "$configpath"
+        uci set $CONFIGURATION.$CONFIGURATION.hashpass=""
+        uci commit $CONFIGURATION
+    fi
+    local enabled
+    config_get_bool enabled $CONFIGURATION enabled 0
+    if [ "$enabled" = "0" ]; then
+        _do_redirect 0
+        return
+    fi
+    config_get workdir $CONFIGURATION workdir "/usr/bin/AdGuardHome"
+
+    mkdir -p "$workdir/data"
+    local cwdfs
+    cwdfs=$(get_filesystem "$workdir")
+    echo "workdir is a $cwdfs filesystem"
+    if [ "$cwdfs" = "jffs2" ]; then
+        echo "fs error ln db to tmp $workdir $cwdfs"
+        logger "AdGuardHome" "warning db redirect to tmp"
+        touch "$workdir/data/stats.db"
+        if [ ! -L "$workdir/data/stats.db" ]; then
+            mv -f "$workdir/data/stats.db" /tmp/stats.db 2>/dev/null
+            ln -s /tmp/stats.db "$workdir/data/stats.db" 2>/dev/null
+        fi
+        touch "$workdir/data/sessions.db"
+        if [ ! -L "$workdir/data/sessions.db" ]; then
+            mv -f "$workdir/data/sessions.db" /tmp/sessions.db 2>/dev/null
+            ln -s /tmp/sessions.db "$workdir/data/sessions.db" 2>/dev/null
+        fi
+    fi
+    local ADDITIONAL_ARGS=""
+    config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome/AdGuardHome"
+
+    mkdir -p "${binpath%/*}"
+    ADDITIONAL_ARGS="$ADDITIONAL_ARGS -c $configpath"
+    ADDITIONAL_ARGS="$ADDITIONAL_ARGS -w $workdir"
+    config_get httpport $CONFIGURATION httpport 3000
+    ADDITIONAL_ARGS="$ADDITIONAL_ARGS -p $httpport"
+
+    printf '%s\n' "$binpath" "$configpath" > /lib/upgrade/keep.d/luci-app-adguardhome
+
+    config_get logfile $CONFIGURATION logfile ""
+    if [ -n "$logfile" ]; then
+        ADDITIONAL_ARGS="$ADDITIONAL_ARGS -l $logfile"
+    fi
+
+    if [ ! -f "$binpath" ]; then
+        _do_redirect 0
+        /usr/share/AdGuardHome/update_core.sh >/dev/null 2>&1 &
+        exit 0
+    fi
+
+    config_get_bool verbose $CONFIGURATION verbose 0
+    if [ "$verbose" -eq 1 ]; then
+        ADDITIONAL_ARGS="$ADDITIONAL_ARGS -v"
+    fi
+
+    if [ "$(uci -q get bypass.@global[0].global_server)" ] && [ "$(uci -q get bypass.@global[0].adguardhome)" = "1" ] && [ "$(uci -q get dhcp.@dnsmasq[0].port)" = "53" ]; then
+        uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
+        uci -q commit AdGuardHome
+        config_load "${CONFIGURATION}"
+    fi
+
+    if [ -f "$configpath" ]; then
+        if ! _do_redirect 1 0; then
+            [ "$(config_editor "dns.port" "" "$configpath" "1")" = "0" ] || return 1
+        fi
+    else
+        _do_redirect 0 0
+    fi
+
+    procd_open_instance
+    get_tz
+    if [ -n "$SET_TZ" ]; then
+        procd_set_param env TZ="$SET_TZ"
+    fi
+    procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+    procd_set_param limits core="unlimited" nofile="65535 65535"
+    procd_set_param stderr 1
+    procd_set_param command "$binpath" $ADDITIONAL_ARGS
+    procd_set_param file "$configpath" "/etc/hosts" "/etc/config/AdGuardHome"
+    procd_close_instance
+    if [ ! -f "$configpath" ]; then
+        config_get "redirect" "AdGuardHome" "redirect" "none"
+        if [ "$redirect" != "none" ]; then
+            procd_open_instance "waitconfig"
+            procd_set_param command "/usr/share/AdGuardHome/watchconfig.sh"
+            procd_close_instance
+            echo "no config start watching"
+        fi
+    fi
+    echo "AdGuardHome service enabled"
+    echo "luci enable switch=$enabled"
+
+}
+
+reload_service() {
+    rm -f /var/run/AdGlucitest 2>/dev/null
+    echo "AdGuardHome reloading"
+    start
+}
+
+stop_service() {
+    stop_core || return 1
+    config_load "${CONFIGURATION}"
+    _do_redirect 0
+    echo "AdGuardHome service disabled"
+    touch /var/run/AdGserverdis
+}
+
+boot() {
+    rc_procd boot_service "$@"
+    eval "type service_started" 2>/dev/null >/dev/null && service_started
+}
\ No newline at end of file
diff --git a/root/etc/uci-defaults/40_luci-AdGuardHome b/root/etc/uci-defaults/40_luci-AdGuardHome
new file mode 100755
index 00000000..e736ba60
--- /dev/null
+++ b/root/etc/uci-defaults/40_luci-AdGuardHome
@@ -0,0 +1,14 @@
+#!/bin/sh
+chmod +x /etc/init.d/AdGuardHome
+uci -q batch <<-EOF >/dev/null 2>&1
+	delete ucitrack.@AdGuardHome[-1]
+	add ucitrack AdGuardHome
+	set ucitrack.@AdGuardHome[-1].init=AdGuardHome
+	commit ucitrack
+EOF
+
+# Remove the former menu and both Lua and ucode menu caches.
+rm -f /usr/share/luci/menu.d/luci-app-adguardhome-js.json
+rm -f /tmp/luci-indexcache /tmp/luci-indexcache.*
+rm -f /tmp/luci-modulecache/*
+exit 0
diff --git a/luci-app-adguardhome/root/lib/upgrade/keep.d/luci-app-adguardhome b/root/lib/upgrade/keep.d/luci-app-adguardhome
similarity index 100%
rename from luci-app-adguardhome/root/lib/upgrade/keep.d/luci-app-adguardhome
rename to root/lib/upgrade/keep.d/luci-app-adguardhome
diff --git a/root/usr/share/AdGuardHome/AdGuardHome_template.yaml b/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
new file mode 100755
index 00000000..b6f63852
--- /dev/null
+++ b/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
@@ -0,0 +1,189 @@
+# 模板用户名为 admin 密码为 admin
+# The username is admin and the password is admin.
+# 保存并应用就可以直接用的配置模板文件
+# a template config can be use with a apply
+http:
+  pprof:
+    port: 6060
+    enabled: false
+  address: 0.0.0.0:3000
+  session_ttl: 720h
+users:
+  - name: admin
+    password: $2y$10$iGkTW98QtGEZn4I/GC0J4eQhfuLQ53v7L4DDVauEJyWylJrXWwWeO
+auth_attempts: 5
+block_auth_min: 15
+http_proxy: ""
+language: ""
+theme: auto
+dns:
+  bind_hosts:
+    - 0.0.0.0
+  port: 3053
+  anonymize_client_ip: false
+  ratelimit: 20
+  ratelimit_subnet_len_ipv4: 24
+  ratelimit_subnet_len_ipv6: 56
+  ratelimit_whitelist: []
+  refuse_any: true
+  upstream_dns:
+    - https://dns.cloudflare.com/dns-query
+    - '#'
+    - '# 对 ts.net 相关域名启用 DNS 分流, 交由 Tailscale 解析, 如不使用 Tailscale 可以删除.'
+    - '# Enable DNS conditional forwarding for ts.net via Tailscale; remove if Tailscale is not used.'
+    - '[/ts.net/]100.100.100.100'
+  upstream_dns_file: ""
+  bootstrap_dns:
+    - 1.1.1.1
+    - 1.0.0.1
+  fallback_dns:
+    - quic://dns.adguard-dns.com
+  upstream_mode: parallel
+  fastest_timeout: 1s
+  allowed_clients: []
+  disallowed_clients: []
+  blocked_hosts:
+    - version.bind
+    - id.server
+    - hostname.bind
+  trusted_proxies:
+    - 127.0.0.0/8
+    - ::1/128
+  cache_enabled: true
+  cache_size: 4194304
+  cache_ttl_min: 0
+  cache_ttl_max: 0
+  cache_optimistic: false
+  cache_optimistic_answer_ttl: 30s
+  cache_optimistic_max_age: 12h
+  bogus_nxdomain: []
+  aaaa_disabled: false
+  enable_dnssec: false
+  edns_client_subnet:
+    custom_ip: ""
+    enabled: false
+    use_custom: false
+  max_goroutines: 300
+  handle_ddr: true
+  ipset: []
+  ipset_file: ""
+  bootstrap_prefer_ipv6: false
+  upstream_timeout: 10s
+  private_networks: []
+  use_private_ptr_resolvers: true
+  local_ptr_upstreams: []
+  use_dns64: false
+  dns64_prefixes: []
+  serve_http3: false
+  use_http3_upstreams: false
+  serve_plain_dns: true
+  hostsfile_enabled: true
+  pending_requests:
+    enabled: true
+tls:
+  enabled: false
+  server_name: ""
+  force_https: false
+  port_https: 443
+  port_dns_over_tls: 853
+  port_dns_over_quic: 853
+  port_dnscrypt: 0
+  dnscrypt_config_file: ""
+  allow_unencrypted_doh: false
+  certificate_chain: ""
+  private_key: ""
+  certificate_path: ""
+  private_key_path: ""
+  strict_sni_check: false
+querylog:
+  dir_path: ""
+  ignored: []
+  interval: 2160h
+  size_memory: 1000
+  enabled: true
+  file_enabled: true
+statistics:
+  dir_path: ""
+  ignored: []
+  interval: 24h
+  enabled: true
+filters:
+  - enabled: true
+    url: https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt
+    name: AdGuard DNS filter
+    id: 1
+whitelist_filters: []
+user_rules: []
+dhcp:
+  enabled: false
+  interface_name: ""
+  local_domain_name: lan
+  dhcpv4:
+    gateway_ip: ""
+    subnet_mask: ""
+    range_start: ""
+    range_end: ""
+    lease_duration: 86400
+    icmp_timeout_msec: 1000
+    options: []
+  dhcpv6:
+    range_start: ""
+    lease_duration: 86400
+    ra_slaac_only: false
+    ra_allow_slaac: false
+filtering:
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_services:
+    schedule:
+      time_zone: UTC
+    ids: []
+  protection_disabled_until: null
+  safe_search:
+    enabled: false
+    bing: true
+    duckduckgo: true
+    ecosia: true
+    google: true
+    pixabay: true
+    yandex: true
+    youtube: true
+  blocking_mode: default
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  rewrites: []
+  safe_fs_patterns:
+    - /tmp/AdGuardHome/userfilters/*
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  filters_update_interval: 24
+  blocked_response_ttl: 10
+  filtering_enabled: true
+  rewrites_enabled: true
+  parental_enabled: false
+  safebrowsing_enabled: false
+  protection_enabled: true
+clients:
+  runtime_sources:
+    whois: true
+    arp: true
+    rdns: true
+    dhcp: true
+    hosts: true
+  persistent: []
+log:
+  enabled: true
+  file: ""
+  max_backups: 0
+  max_size: 100
+  max_age: 3
+  compress: false
+  local_time: false
+  verbose: false
+os:
+  group: ""
+  user: ""
+  rlimit_nofile: 0
+schema_version: 32
\ No newline at end of file
diff --git a/luci-app-adguardhome/root/usr/share/AdGuardHome/adguardhome.nft.tpl b/root/usr/share/AdGuardHome/adguardhome.nft.tpl
similarity index 100%
rename from luci-app-adguardhome/root/usr/share/AdGuardHome/adguardhome.nft.tpl
rename to root/usr/share/AdGuardHome/adguardhome.nft.tpl
diff --git a/root/usr/share/AdGuardHome/getsyslog.sh b/root/usr/share/AdGuardHome/getsyslog.sh
new file mode 100755
index 00000000..e6387b26
--- /dev/null
+++ b/root/usr/share/AdGuardHome/getsyslog.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+logread -e AdGuardHome > /tmp/AdGuardHometmp.log
+logread -e AdGuardHome -f >> /tmp/AdGuardHometmp.log &
+pid=$!
+echo "1" > /var/run/AdGuardHomesyslog
+while true
+do
+	sleep 12
+	watchdog=$(cat /var/run/AdGuardHomesyslog 2>/dev/null)
+	if [ "${watchdog}x" = "0x" ]; then
+		kill "$pid"
+		rm /tmp/AdGuardHometmp.log
+		rm /var/run/AdGuardHomesyslog
+		exit 0
+	else
+		echo "0" > /var/run/AdGuardHomesyslog
+	fi
+done
\ No newline at end of file
diff --git a/root/usr/share/AdGuardHome/update_core.sh b/root/usr/share/AdGuardHome/update_core.sh
new file mode 100755
index 00000000..2be7a26c
--- /dev/null
+++ b/root/usr/share/AdGuardHome/update_core.sh
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+update_mode=$1
+
+# Keep the lock file: unlinking it would allow a second lock on a new inode.
+exec 9>/var/lock/AdGuardHome-update.lock || exit 1
+# Allow a brief status probe to finish before treating the lock as busy.
+if ! flock -w 1 9; then
+	printf '%s\n' '已经有更新任务正在运行，请等待其结束。'
+	exit 2
+fi
+
+# Only the lock owner may reset the log and update status.
+exec >/tmp/AdGuardHome_update.log 2>&1
+cleanup() {
+	local result=$?
+	trap - EXIT
+	[ "$result" -ne 0 ] && touch /var/run/update_core_error
+	rm -f /var/run/update_core
+	exit "$result"
+}
+trap cleanup EXIT
+trap 'exit 1' TERM INT HUP
+rm -f /var/run/update_core_error
+touch /var/run/update_core
+binpath=$(uci get AdGuardHome.AdGuardHome.binpath 2>/dev/null)
+if [ -z "$binpath" ]; then
+	uci set AdGuardHome.AdGuardHome.binpath="/tmp/AdGuardHome/AdGuardHome"
+	binpath="/tmp/AdGuardHome/AdGuardHome"
+fi
+[ ! -d "${binpath%/*}" ] && mkdir -p "${binpath%/*}"
+enabled=$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)
+core_api_url="https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest"
+
+Check_Updates(){
+	downloader_cmd="uclient-fetch"
+	downloader_opts="-T 5 -q -O"
+	downloader_quiet_opts="-q -O -"
+	printf "%s\n" "开始检查更新, 请耐心等待 ..."
+	Cloud_Version="$(${downloader_cmd} ${downloader_quiet_opts} "$core_api_url" 2>/dev/null | sed -n 's/.*"tag_name":[ ]*"\(v[^"]*\)".*/\1/p' | head -n 1)"
+	[ -z "$Cloud_Version" ] && printf "\n检查更新失败, 请检查网络或稍后重试!\n" && EXIT 1
+	if [ -f "$binpath" ]; then
+		Current_Version="$($binpath --version 2>/dev/null | sed -n 's/.*\(v[0-9][0-9.]*\).*/\1/p' | head -n 1)"
+	else
+		Current_Version="未知"
+	fi
+	[ -z "$Current_Version" ] && Current_Version="未知"
+	printf "\n执行文件路径: %s\n\n正在检查更新, 请耐心等待 ...\n" "${binpath%/*}"
+	printf "\n当前 AdGuardHome 版本: %s\n云端 AdGuardHome 版本: %s\n" "$Current_Version" "$Cloud_Version"
+	if [ "$Cloud_Version" != "$Current_Version" ] || [ "$1" = force ]; then
+		Update_Core
+	else
+		printf "\n已是最新版本, 无需更新!\n"
+		EXIT 0
+	fi
+	EXIT 0
+}
+
+Update_Core(){
+	rm -rf /tmp/AdGuardHome_Update > /dev/null 2>&1
+	mkdir -p "/tmp/AdGuardHome_Update"
+	GET_Arch
+	link="https://github.com/AdguardTeam/AdGuardHome/releases/download/${Cloud_Version}/AdGuardHome_linux_${Arch}.tar.gz"
+	printf "%s\n" "下载链接:${link}"
+	printf "%s\n" "文件名称:${link##*/}"
+	printf "\n开始下载 AdGuardHome 核心文件 ...\n\n"
+	${downloader_cmd} ${downloader_opts} "/tmp/AdGuardHome_Update/${link##*/}" "$link" > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		printf "\nAdGuardHome 核心下载失败，请检查网络、系统时间及 CA 证书 ...\n"
+		rm -rf /tmp/AdGuardHome_Update
+		EXIT 1
+	fi 
+	if [ "${link##*.}" = "gz" ]; then
+		printf "\n正在解压 AdGuardHome ...\n"
+		tar -zxf "/tmp/AdGuardHome_Update/${link##*/}" -C "/tmp/AdGuardHome_Update/"
+		if [ ! -e /tmp/AdGuardHome_Update/AdGuardHome ]
+		then
+			printf "%s\n" "AdGuardHome 核心解压失败!"
+			rm -rf "/tmp/AdGuardHome_Update" > /dev/null 2>&1
+			EXIT 1
+		fi
+		downloadbin="/tmp/AdGuardHome_Update/AdGuardHome/AdGuardHome"
+	else
+		downloadbin="/tmp/AdGuardHome_Update/${link##*/}"
+	fi
+	chmod +x "$downloadbin"
+	size_bytes=$(wc -c < "$downloadbin" 2>/dev/null || echo 0)
+	printf "\nAdGuardHome 核心体积: %s\n" "$(awk -v bytes="$size_bytes" 'BEGIN{printf "%.2fMB", bytes/1000000}')"
+	/etc/init.d/AdGuardHome stop 9>&- > /dev/null 2>&1
+	printf "\n移动 AdGuardHome 核心文件到 %s ...\n" "${binpath%/*}"
+	if ! mv -f "$downloadbin" "$binpath" > /dev/null 2>&1 || [ ! -s "$binpath" ]; then
+		printf "AdGuardHome 核心移动失败!\n可能是设备空间不足导致, 请尝试更改 [执行文件路径] 为 /tmp/AdGuardHome\n"
+		EXIT 1
+	fi
+	rm -rf /tmp/AdGuardHome_Update
+	chmod +x "$binpath"
+	if [ "$enabled" = 1 ]; then
+		printf "\n正在重启 AdGuardHome 服务...\n"
+		/etc/init.d/AdGuardHome restart 9>&- > /dev/null 2>&1
+	fi
+	printf "\nAdGuardHome 核心更新成功!\n"
+}
+
+GET_Arch() {
+	if command -v apk > /dev/null 2>&1; then
+		PM="apk"
+	elif command -v opkg > /dev/null 2>&1; then
+		PM="opkg"
+	else
+		printf "%s\n" "未找到包管理器 (apk/opkg)!" && EXIT 1
+	fi
+	case "${PM}" in
+	apk)
+		Archt="$(apk info -a kernel 2>/dev/null | grep Architecture | awk -F ":[ ]*" '{print $2}')"
+		[ -z "$Archt" ] && Archt="$(uname -m)"
+	;;
+	opkg)
+		Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
+	;;
+	esac
+	case "${Archt}" in
+	i386)
+		Arch=i386
+	;;
+	i686)
+		Arch=i386
+	;;
+	x86|x86_64)
+		Arch=amd64
+	;;
+	mipsel)
+		Arch=mipsle_softfloat
+	;;
+	mips)
+		Arch=mips_softfloat
+	;;
+	mips64el)
+		Arch=mips64le_softfloat
+	;;
+	mips64)
+		Arch=mips64_softfloat
+	;;
+	arm)
+		Arch=arm
+	;;
+	armeb)
+		Arch=armeb
+	;;
+	aarch64)
+		Arch=arm64
+	;;
+	*)
+		printf "\nAdGuardHome 暂不支持当前的设备架构: [%s]!\n" "$Archt"
+		EXIT 1
+	esac
+	printf "\n当前设备架构: %s\n" "$Arch"
+}
+
+EXIT(){
+	exit "$1"
+}
+
+Check_Updates "$update_mode"
diff --git a/root/usr/share/AdGuardHome/watchconfig.sh b/root/usr/share/AdGuardHome/watchconfig.sh
new file mode 100755
index 00000000..f6850663
--- /dev/null
+++ b/root/usr/share/AdGuardHome/watchconfig.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+configpath=$(uci get AdGuardHome.AdGuardHome.configpath)
+while :
+do
+	sleep 10
+	if [ -f "$configpath" ]; then
+		/etc/init.d/AdGuardHome do_redirect 1
+		break
+	fi
+done
+exit 0
\ No newline at end of file
diff --git a/root/usr/share/luci/menu.d/luci-app-adguardhome.json b/root/usr/share/luci/menu.d/luci-app-adguardhome.json
new file mode 100644
index 00000000..6cdcf8bb
--- /dev/null
+++ b/root/usr/share/luci/menu.d/luci-app-adguardhome.json
@@ -0,0 +1,45 @@
+{
+        "admin/services/AdGuardHome": {
+                "title": "AdGuard Home",
+                "order": 12,
+                "action": {
+                        "type": "firstchild"
+                },
+                "depends": {
+                        "acl": [ "luci-app-adguardhome" ]
+                }
+        },
+        "admin/services/AdGuardHome/base": {
+                "title": "Base Setting",
+                "order": 1,
+                "action": {
+                        "type": "view",
+                        "path": "adguardhome/base"
+                },
+                "depends": {
+                        "acl": [ "luci-app-adguardhome" ]
+                }
+        },
+        "admin/services/AdGuardHome/log": {
+                "title": "Log",
+                "order": 3,
+                "action": {
+                        "type": "view",
+                        "path": "adguardhome/log"
+                },
+                "depends": {
+                        "acl": [ "luci-app-adguardhome" ]
+                }
+        },
+        "admin/services/AdGuardHome/manual": {
+                "title": "Manual Config",
+                "order": 2,
+                "action": {
+                        "type": "view",
+                        "path": "adguardhome/manual"
+                },
+                "depends": {
+                        "acl": [ "luci-app-adguardhome" ]
+                }
+        }
+}
diff --git a/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json b/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
new file mode 100644
index 00000000..41727fce
--- /dev/null
+++ b/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
@@ -0,0 +1,21 @@
+{
+	"luci-app-adguardhome": {
+		"description": "Grant UCI access for luci-app-adguardhome",
+		"read": {
+			"file": {
+				"/var/run/AdGredir": [ "read" ]
+			},
+			"ubus": {
+				"service": [ "list" ],
+				"luci.adguardhome": [ "getCoreInfo", "getRedirectStatus", "getCoreUpdate", "getInterfaces", "getRuntimeLog", "getManualConfig" ]
+			},
+			"uci": [ "AdGuardHome" ]
+		},
+		"write": {
+			"ubus": {
+				"luci.adguardhome": [ "setVerboseLog", "startCoreUpdate", "changeWebPassword", "clearRuntimeLog", "setManualConfig" ]
+			},
+			"uci": [ "AdGuardHome" ]
+		}
+	}
+}
\ No newline at end of file
diff --git a/luci-app-adguardhome/root/usr/share/rpcd/ucode/luci.adguardhome b/root/usr/share/rpcd/ucode/luci.adguardhome
similarity index 100%
rename from luci-app-adguardhome/root/usr/share/rpcd/ucode/luci.adguardhome
rename to root/usr/share/rpcd/ucode/luci.adguardhome
diff --git a/root/www/luci-static/resources/codemirror/lib/codemirror.css b/root/www/luci-static/resources/codemirror/lib/codemirror.css
new file mode 100644
index 00000000..43ac1a9f
--- /dev/null
+++ b/root/www/luci-static/resources/codemirror/lib/codemirror.css
@@ -0,0 +1 @@
+.CodeMirror{font-family:monospace;height:500px;color:black;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color:white}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:black}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid black;border-right:0;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0 !important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-fat-cursor-mark{background-color:rgba(20,255,20,0.5);-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:blue}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:bold}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3,.cm-s-default .cm-type{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta{color:#555}.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error{color:red}.cm-invalidchar{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:white}.CodeMirror-scroll{overflow:scroll !important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none !important;border:none !important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0}
diff --git a/root/www/luci-static/resources/codemirror/lib/codemirror.js b/root/www/luci-static/resources/codemirror/lib/codemirror.js
new file mode 100644
index 00000000..d01f072e
--- /dev/null
+++ b/root/www/luci-static/resources/codemirror/lib/codemirror.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.CodeMirror=t()}(this,function(){"use strict";var e=navigator.userAgent,t=navigator.platform,r=/gecko\/\d/i.test(e),n=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=/Edge\/(\d+)/.exec(e),l=n||i||o,s=l&&(n?document.documentMode||6:+(o||i)[1]),a=!o&&/WebKit\//.test(e),u=a&&/Qt\/\d+\.\d+/.test(e),c=!o&&/Chrome\//.test(e),h=/Opera\//.test(e),f=/Apple Computer/.test(navigator.vendor),d=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),p=/PhantomJS/.test(e),g=!o&&/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),v=/Android/.test(e),m=g||v||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),y=g||/Mac/.test(t),b=/\bCrOS\b/.test(e),w=/win/i.test(t),x=h&&e.match(/Version\/(\d*\.\d*)/);x&&(x=Number(x[1])),x&&x>=15&&(h=!1,a=!0);var C=y&&(u||h&&(null==x||x<12.11)),S=r||l&&s>=9;function L(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}var k,T=function(e,t){var r=e.className,n=L(t).exec(r);if(n){var i=r.slice(n.index+n[0].length);e.className=r.slice(0,n.index)+(i?n[1]+i:"")}};function M(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function N(e,t){return M(e).appendChild(t)}function O(e,t,r,n){var i=document.createElement(e);if(r&&(i.className=r),n&&(i.style.cssText=n),"string"==typeof t)i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o=t)return l+(t-o);l+=s-o,l+=r-l%r,o=s+1}}g?P=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:l&&(P=function(e){try{e.select()}catch(e){}});var R=function(){this.id=null,this.f=null,this.time=0,this.handler=E(this.onTimeout,this)};function B(e,t){for(var r=0;r=t)return n+Math.min(l,t-i);if(i+=o-n,n=o+1,(i+=r-i%r)>=t)return n}}var Y=[""];function _(e){for(;Y.length<=e;)Y.push($(Y)+" ");return Y[e]}function $(e){return e[e.length-1]}function q(e,t){for(var r=[],n=0;n"€"&&(e.toUpperCase()!=e.toLowerCase()||J.test(e))}function te(e,t){return t?!!(t.source.indexOf("\\w")>-1&&ee(e))||t.test(e):ee(e)}function re(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}var ne=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function ie(e){return e.charCodeAt(0)>=768&&ne.test(e)}function oe(e,t,r){for(;(r<0?t>0:tr?-1:1;;){if(t==r)return t;var i=(t+r)/2,o=n<0?Math.ceil(i):Math.floor(i);if(o==t)return e(o)?t:r;e(o)?r=o:t=o+n}}var se=null;function ae(e,t,r){var n;se=null;for(var i=0;it)return i;o.to==t&&(o.from!=o.to&&"before"==r?n=i:se=i),o.from==t&&(o.from!=o.to&&"before"!=r?n=i:se=i)}return null!=n?n:se}var ue=function(){var e="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",t="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";var r=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,n=/[stwN]/,i=/[LRr]/,o=/[Lb1n]/,l=/[1n]/;function s(e,t,r){this.level=e,this.from=t,this.to=r}return function(a,u){var c="ltr"==u?"L":"R";if(0==a.length||"ltr"==u&&!r.test(a))return!1;for(var h,f=a.length,d=[],p=0;p-1&&(n[t]=i.slice(0,o).concat(i.slice(o+1)))}}}function ge(e,t){var r=de(e,t);if(r.length)for(var n=Array.prototype.slice.call(arguments,2),i=0;i0}function be(e){e.prototype.on=function(e,t){fe(this,e,t)},e.prototype.off=function(e,t){pe(this,e,t)}}function we(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function xe(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}function Ce(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}function Se(e){we(e),xe(e)}function Le(e){return e.target||e.srcElement}function ke(e){var t=e.which;return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),y&&e.ctrlKey&&1==t&&(t=3),t}var Te,Me,Ne=function(){if(l&&s<9)return!1;var e=O("div");return"draggable"in e||"dragDrop"in e}();function Oe(e){if(null==Te){var t=O("span","​");N(e,O("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(Te=t.offsetWidth<=1&&t.offsetHeight>2&&!(l&&s<8))}var r=Te?O("span","​"):O("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return r.setAttribute("cm-text",""),r}function Ae(e){if(null!=Me)return Me;var t=N(e,document.createTextNode("AخA")),r=k(t,0,1).getBoundingClientRect(),n=k(t,1,2).getBoundingClientRect();return M(e),!(!r||r.left==r.right)&&(Me=n.right-r.right<3)}var De,We=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,r=[],n=e.length;t<=n;){var i=e.indexOf("\n",t);-1==i&&(i=e.length);var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),l=o.indexOf("\r");-1!=l?(r.push(o.slice(0,l)),t+=l+1):(r.push(o),t=i+1)}return r}:function(e){return e.split(/\r\n?|\n/)},He=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(e){return!1}}:function(e){var t;try{t=e.ownerDocument.selection.createRange()}catch(e){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},Fe="oncopy"in(De=O("div"))||(De.setAttribute("oncopy","return;"),"function"==typeof De.oncopy),Pe=null;var Ee={},Ie={};function ze(e){if("string"==typeof e&&Ie.hasOwnProperty(e))e=Ie[e];else if(e&&"string"==typeof e.name&&Ie.hasOwnProperty(e.name)){var t=Ie[e.name];"string"==typeof t&&(t={name:t}),(e=Q(t,e)).name=t.name}else{if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return ze("application/xml");if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+json$/.test(e))return ze("application/json")}return"string"==typeof e?{name:e}:e||{name:"null"}}function Re(e,t){t=ze(t);var r=Ee[t.name];if(!r)return Re(e,"text/plain");var n=r(e,t);if(Be.hasOwnProperty(t.name)){var i=Be[t.name];for(var o in i)i.hasOwnProperty(o)&&(n.hasOwnProperty(o)&&(n["_"+o]=n[o]),n[o]=i[o])}if(n.name=t.name,t.helperType&&(n.helperType=t.helperType),t.modeProps)for(var l in t.modeProps)n[l]=t.modeProps[l];return n}var Be={};function Ge(e,t){I(t,Be.hasOwnProperty(e)?Be[e]:Be[e]={})}function Ue(e,t){if(!0===t)return t;if(e.copyState)return e.copyState(t);var r={};for(var n in t){var i=t[n];i instanceof Array&&(i=i.concat([])),r[n]=i}return r}function Ve(e,t){for(var r;e.innerMode&&(r=e.innerMode(t))&&r.mode!=e;)t=r.state,e=r.mode;return r||{mode:e,state:t}}function Ke(e,t,r){return!e.startState||e.startState(t,r)}var je=function(e,t,r){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=r};function Xe(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var r=e;!r.lines;)for(var n=0;;++n){var i=r.children[n],o=i.chunkSize();if(t=e.first&&tr?et(r,Xe(e,r).text.length):function(e,t){var r=e.ch;return null==r||r>t?et(e.line,t):r<0?et(e.line,0):e}(t,Xe(e,t.line).text.length)}function at(e,t){for(var r=[],n=0;n=this.string.length},je.prototype.sol=function(){return this.pos==this.lineStart},je.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},je.prototype.next=function(){if(this.post},je.prototype.eatSpace=function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},je.prototype.skipToEnd=function(){this.pos=this.string.length},je.prototype.skipTo=function(e){var t=this.string.indexOf(e,this.pos);if(t>-1)return this.pos=t,!0},je.prototype.backUp=function(e){this.pos-=e},je.prototype.column=function(){return this.lastColumnPos0?null:(n&&!1!==t&&(this.pos+=n[0].length),n)}var i=function(e){return r?e.toLowerCase():e};if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},je.prototype.current=function(){return this.string.slice(this.start,this.pos)},je.prototype.hideFirstChars=function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}},je.prototype.lookAhead=function(e){var t=this.lineOracle;return t&&t.lookAhead(e)},je.prototype.baseToken=function(){var e=this.lineOracle;return e&&e.baseToken(this.pos)};var ut=function(e,t){this.state=e,this.lookAhead=t},ct=function(e,t,r,n){this.state=t,this.doc=e,this.line=r,this.maxLookAhead=n||0,this.baseTokens=null,this.baseTokenPos=1};function ht(e,t,r,n){var i=[e.state.modeGen],o={};wt(e,t.text,e.doc.mode,r,function(e,t){return i.push(e,t)},o,n);for(var l=r.state,s=function(n){r.baseTokens=i;var s=e.state.overlays[n],a=1,u=0;r.state=!0,wt(e,t.text,s.mode,r,function(e,t){for(var r=a;ue&&i.splice(a,1,e,i[a+1],n),a+=2,u=Math.min(e,n)}if(t)if(s.opaque)i.splice(r,a-r,e,"overlay "+t),a=r+2;else for(;re.options.maxHighlightLength&&Ue(e.doc.mode,n.state),o=ht(e,t,n);i&&(n.state=i),t.stateAfter=n.save(!i),t.styles=o.styles,o.classes?t.styleClasses=o.classes:t.styleClasses&&(t.styleClasses=null),r===e.doc.highlightFrontier&&(e.doc.modeFrontier=Math.max(e.doc.modeFrontier,++e.doc.highlightFrontier))}return t.styles}function dt(e,t,r){var n=e.doc,i=e.display;if(!n.mode.startState)return new ct(n,!0,t);var o=function(e,t,r){for(var n,i,o=e.doc,l=r?-1:t-(e.doc.mode.innerMode?1e3:100),s=t;s>l;--s){if(s<=o.first)return o.first;var a=Xe(o,s-1),u=a.stateAfter;if(u&&(!r||s+(u instanceof ut?u.lookAhead:0)<=o.modeFrontier))return s;var c=z(a.text,null,e.options.tabSize);(null==i||n>c)&&(i=s-1,n=c)}return i}(e,t,r),l=o>n.first&&Xe(n,o-1).stateAfter,s=l?ct.fromSaved(n,l,o):new ct(n,Ke(n.mode),o);return n.iter(o,t,function(r){pt(e,r.text,s);var n=s.line;r.stateAfter=n==t-1||n%5==0||n>=i.viewFrom&&nt.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}ct.prototype.lookAhead=function(e){var t=this.doc.getLine(this.line+e);return null!=t&&e>this.maxLookAhead&&(this.maxLookAhead=e),t},ct.prototype.baseToken=function(e){if(!this.baseTokens)return null;for(;this.baseTokens[this.baseTokenPos]<=e;)this.baseTokenPos+=2;var t=this.baseTokens[this.baseTokenPos+1];return{type:t&&t.replace(/( |^)overlay .*/,""),size:this.baseTokens[this.baseTokenPos]-e}},ct.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},ct.fromSaved=function(e,t,r){return t instanceof ut?new ct(e,Ue(e.mode,t.state),r,t.lookAhead):new ct(e,Ue(e.mode,t),r)},ct.prototype.save=function(e){var t=!1!==e?Ue(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new ut(t,this.maxLookAhead):t};var mt=function(e,t,r){this.start=e.start,this.end=e.pos,this.string=e.current(),this.type=t||null,this.state=r};function yt(e,t,r,n){var i,o,l=e.doc,s=l.mode,a=Xe(l,(t=st(l,t)).line),u=dt(e,t.line,r),c=new je(a.text,e.options.tabSize,u);for(n&&(o=[]);(n||c.pose.options.maxHighlightLength?(s=!1,l&&pt(e,t,n,h.pos),h.pos=t.length,a=null):a=bt(vt(r,h,n.state,f),o),f){var d=f[0].name;d&&(a="m-"+(a?d+" "+a:d))}if(!s||c!=a){for(;u=t:o.to>t);(n||(n=[])).push(new St(l,o.from,s?null:o.to))}}return n}(r,i,l),a=function(e,t,r){var n;if(e)for(var i=0;i=t:o.to>t)||o.from==t&&"bookmark"==l.type&&(!r||o.marker.insertLeft)){var s=null==o.from||(l.inclusiveLeft?o.from<=t:o.from0&&s)for(var b=0;bt)&&(!r||Wt(r,o.marker)<0)&&(r=o.marker)}return r}function It(e,t,r,n,i){var o=Xe(e,t),l=Ct&&o.markedSpans;if(l)for(var s=0;s=0&&h<=0||c<=0&&h>=0)&&(c<=0&&(a.marker.inclusiveRight&&i.inclusiveLeft?tt(u.to,r)>=0:tt(u.to,r)>0)||c>=0&&(a.marker.inclusiveRight&&i.inclusiveLeft?tt(u.from,n)<=0:tt(u.from,n)<0)))return!0}}}function zt(e){for(var t;t=Ft(e);)e=t.find(-1,!0).line;return e}function Rt(e,t){var r=Xe(e,t),n=zt(r);return r==n?t:qe(n)}function Bt(e,t){if(t>e.lastLine())return t;var r,n=Xe(e,t);if(!Gt(e,n))return t;for(;r=Pt(n);)n=r.find(1,!0).line;return qe(n)+1}function Gt(e,t){var r=Ct&&t.markedSpans;if(r)for(var n=void 0,i=0;it.maxLineLength&&(t.maxLineLength=r,t.maxLine=e)})}var Xt=function(e,t,r){this.text=e,Ot(this,t),this.height=r?r(this):1};function Yt(e){e.parent=null,Nt(e)}Xt.prototype.lineNo=function(){return qe(this)},be(Xt);var _t={},$t={};function qt(e,t){if(!e||/^\s*$/.test(e))return null;var r=t.addModeClass?$t:_t;return r[e]||(r[e]=e.replace(/\S+/g,"cm-$&"))}function Zt(e,t){var r=A("span",null,null,a?"padding-right: .1px":null),n={pre:A("pre",[r],"CodeMirror-line"),content:r,col:0,pos:0,cm:e,trailingSpace:!1,splitSpaces:e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o=i?t.rest[i-1]:t.line,l=void 0;n.pos=0,n.addToken=Jt,Ae(e.display.measure)&&(l=ce(o,e.doc.direction))&&(n.addToken=er(n.addToken,l)),n.map=[],rr(o,n,ft(e,o,t!=e.display.externalMeasured&&qe(o))),o.styleClasses&&(o.styleClasses.bgClass&&(n.bgClass=F(o.styleClasses.bgClass,n.bgClass||"")),o.styleClasses.textClass&&(n.textClass=F(o.styleClasses.textClass,n.textClass||""))),0==n.map.length&&n.map.push(0,0,n.content.appendChild(Oe(e.display.measure))),0==i?(t.measure.map=n.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(n.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(a){var s=n.content.lastChild;(/\bcm-tab\b/.test(s.className)||s.querySelector&&s.querySelector(".cm-tab"))&&(n.content.className="cm-tab-wrap-hack")}return ge(e,"renderLine",e,t.line,n.pre),n.pre.className&&(n.textClass=F(n.pre.className,n.textClass||"")),n}function Qt(e){var t=O("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Jt(e,t,r,n,i,o,a){if(t){var u,c=e.splitSpaces?function(e,t){if(e.length>1&&!/  /.test(e))return e;for(var r=t,n="",i=0;iu&&h.from<=u);f++);if(h.to>=c)return e(r,n,i,o,l,s,a);e(r,n.slice(0,h.to-u),i,o,null,s,a),o=null,n=n.slice(h.to-u),u=h.to}}}function tr(e,t,r,n){var i=!n&&r.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!n&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",r.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t,e.trailingSpace=!1}function rr(e,t,r){var n=e.markedSpans,i=e.text,o=0;if(n)for(var l,s,a,u,c,h,f,d=i.length,p=0,g=1,v="",m=0;;){if(m==p){a=u=c=s="",f=null,h=null,m=1/0;for(var y=[],b=void 0,w=0;wp||C.collapsed&&x.to==p&&x.from==p)){if(null!=x.to&&x.to!=p&&m>x.to&&(m=x.to,u=""),C.className&&(a+=" "+C.className),C.css&&(s=(s?s+";":"")+C.css),C.startStyle&&x.from==p&&(c+=" "+C.startStyle),C.endStyle&&x.to==m&&(b||(b=[])).push(C.endStyle,x.to),C.title&&((f||(f={})).title=C.title),C.attributes)for(var S in C.attributes)(f||(f={}))[S]=C.attributes[S];C.collapsed&&(!h||Wt(h.marker,C)<0)&&(h=x)}else x.from>p&&m>x.from&&(m=x.from)}if(b)for(var L=0;L=d)break;for(var T=Math.min(d,m);;){if(v){var M=p+v.length;if(!h){var N=M>T?v.slice(0,T-p):v;t.addToken(t,N,l?l+a:a,c,p+N.length==m?u:"",s,f)}if(M>=T){v=v.slice(T-p),p=T;break}p=M,c=""}v=i.slice(o,o=r[g++]),l=qt(r[g++],t.cm.options)}}else for(var O=1;Or)return{map:e.measure.maps[i],cache:e.measure.caches[i],before:!0}}function Or(e,t,r,n){return Wr(e,Dr(e,t),r,n)}function Ar(e,t){if(t>=e.display.viewFrom&&t=r.lineN&&t2&&o.push((a.bottom+u.top)/2-r.top)}}o.push(r.bottom-r.top)}}(e,t.view,t.rect),t.hasHeights=!0),(o=function(e,t,r,n){var i,o=Pr(t.map,r,n),a=o.node,u=o.start,c=o.end,h=o.collapse;if(3==a.nodeType){for(var f=0;f<4;f++){for(;u&&ie(t.line.text.charAt(o.coverStart+u));)--u;for(;o.coverStart+c1}(e))return t;var r=screen.logicalXDPI/screen.deviceXDPI,n=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*r,right:t.right*r,top:t.top*n,bottom:t.bottom*n}}(e.display.measure,i))}else{var d;u>0&&(h=n="right"),i=e.options.lineWrapping&&(d=a.getClientRects()).length>1?d["right"==n?d.length-1:0]:a.getBoundingClientRect()}if(l&&s<9&&!u&&(!i||!i.left&&!i.right)){var p=a.parentNode.getClientRects()[0];i=p?{left:p.left,right:p.left+tn(e.display),top:p.top,bottom:p.bottom}:Fr}for(var g=i.top-t.rect.top,v=i.bottom-t.rect.top,m=(g+v)/2,y=t.view.measure.heights,b=0;bt)&&(i=(o=a-s)-1,t>=a&&(l="right")),null!=i){if(n=e[u+2],s==a&&r==(n.insertLeft?"left":"right")&&(l=r),"left"==r&&0==i)for(;u&&e[u-2]==e[u-3]&&e[u-1].insertLeft;)n=e[2+(u-=3)],l="left";if("right"==r&&i==a-s)for(;u=0&&(r=e[i]).left==r.right;i--);return r}function Ir(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t=n.text.length?(a=n.text.length,u="before"):a<=0&&(a=0,u="after"),!s)return l("before"==u?a-1:a,"before"==u);function c(e,t,r){return l(r?e-1:e,1==s[t].level!=r)}var h=ae(s,a,u),f=se,d=c(a,h,"before"==u);return null!=f&&(d.other=c(a,f,"before"!=u)),d}function Yr(e,t){var r=0;t=st(e.doc,t),e.options.lineWrapping||(r=tn(e.display)*t.ch);var n=Xe(e.doc,t.line),i=Vt(n)+Cr(e.display);return{left:r,right:r,top:i,bottom:i+n.height}}function _r(e,t,r,n,i){var o=et(e,t,r);return o.xRel=i,n&&(o.outside=n),o}function $r(e,t,r){var n=e.doc;if((r+=e.display.viewOffset)<0)return _r(n.first,0,null,-1,-1);var i=Ze(n,r),o=n.first+n.size-1;if(i>o)return _r(n.first+n.size-1,Xe(n,o).text.length,null,1,1);t<0&&(t=0);for(var l=Xe(n,i);;){var s=Jr(e,l,i,t,r),a=Et(l,s.ch+(s.xRel>0||s.outside>0?1:0));if(!a)return s;var u=a.find(1);if(u.line==i)return u;l=Xe(n,i=u.line)}}function qr(e,t,r,n){n-=Ur(t);var i=t.text.length,o=le(function(t){return Wr(e,r,t-1).bottom<=n},i,0);return{begin:o,end:i=le(function(t){return Wr(e,r,t).top>n},o,i)}}function Zr(e,t,r,n){return r||(r=Dr(e,t)),qr(e,t,r,Vr(e,t,Wr(e,r,n),"line").top)}function Qr(e,t,r,n){return!(e.bottom<=r)&&(e.top>r||(n?e.left:e.right)>t)}function Jr(e,t,r,n,i){i-=Vt(t);var o=Dr(e,t),l=Ur(t),s=0,a=t.text.length,u=!0,c=ce(t,e.doc.direction);if(c){var h=(e.options.lineWrapping?function(e,t,r,n,i,o,l){var s=qr(e,t,n,l),a=s.begin,u=s.end;/\s/.test(t.text.charAt(u-1))&&u--;for(var c=null,h=null,f=0;f=u||d.to<=a)){var p=1!=d.level,g=Wr(e,n,p?Math.min(u,d.to)-1:Math.max(a,d.from)).right,v=gv)&&(c=d,h=v)}}c||(c=i[i.length-1]);c.fromu&&(c={from:c.from,to:u,level:c.level});return c}:function(e,t,r,n,i,o,l){var s=le(function(s){var a=i[s],u=1!=a.level;return Qr(Xr(e,et(r,u?a.to:a.from,u?"before":"after"),"line",t,n),o,l,!0)},0,i.length-1),a=i[s];if(s>0){var u=1!=a.level,c=Xr(e,et(r,u?a.from:a.to,u?"after":"before"),"line",t,n);Qr(c,o,l,!0)&&c.top>l&&(a=i[s-1])}return a})(e,t,r,o,c,n,i);s=(u=1!=h.level)?h.from:h.to-1,a=u?h.to:h.from-1}var f,d,p=null,g=null,v=le(function(t){var r=Wr(e,o,t);return r.top+=l,r.bottom+=l,!!Qr(r,n,i,!1)&&(r.top<=i&&r.left<=n&&(p=t,g=r),!0)},s,a),m=!1;if(g){var y=n-g.left=w.bottom?1:0}return _r(r,v=oe(t.text,v,1),d,m,n-f)}function en(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight;if(null==Hr){Hr=O("pre",null,"CodeMirror-line-like");for(var t=0;t<49;++t)Hr.appendChild(document.createTextNode("x")),Hr.appendChild(O("br"));Hr.appendChild(document.createTextNode("x"))}N(e.measure,Hr);var r=Hr.offsetHeight/50;return r>3&&(e.cachedTextHeight=r),M(e.measure),r||1}function tn(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth;var t=O("span","xxxxxxxxxx"),r=O("pre",[t],"CodeMirror-line-like");N(e.measure,r);var n=t.getBoundingClientRect(),i=(n.right-n.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function rn(e){for(var t=e.display,r={},n={},i=t.gutters.clientLeft,o=t.gutters.firstChild,l=0;o;o=o.nextSibling,++l){var s=e.display.gutterSpecs[l].className;r[s]=o.offsetLeft+o.clientLeft+i,n[s]=o.clientWidth}return{fixedPos:nn(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:r,gutterWidth:n,wrapperWidth:t.wrapper.clientWidth}}function nn(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function on(e){var t=en(e.display),r=e.options.lineWrapping,n=r&&Math.max(5,e.display.scroller.clientWidth/tn(e.display)-3);return function(i){if(Gt(e.doc,i))return 0;var o=0;if(i.widgets)for(var l=0;l=e.display.viewTo)return null;if((t-=e.display.viewFrom)<0)return null;for(var r=e.display.view,n=0;nt)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)Ct&&Rt(e.doc,t)i.viewFrom?hn(e):(i.viewFrom+=n,i.viewTo+=n);else if(t<=i.viewFrom&&r>=i.viewTo)hn(e);else if(t<=i.viewFrom){var o=fn(e,r,r+n,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=n):hn(e)}else if(r>=i.viewTo){var l=fn(e,t,t,-1);l?(i.view=i.view.slice(0,l.index),i.viewTo=l.lineN):hn(e)}else{var s=fn(e,t,t,-1),a=fn(e,r,r+n,1);s&&a?(i.view=i.view.slice(0,s.index).concat(ir(e,s.lineN,a.lineN)).concat(i.view.slice(a.index)),i.viewTo+=n):hn(e)}var u=i.externalMeasured;u&&(r=i.lineN&&t=n.viewTo)){var o=n.view[an(e,t)];if(null!=o.node){var l=o.changes||(o.changes=[]);-1==B(l,r)&&l.push(r)}}}function hn(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function fn(e,t,r,n){var i,o=an(e,t),l=e.display.view;if(!Ct||r==e.doc.first+e.doc.size)return{index:o,lineN:r};for(var s=e.display.viewFrom,a=0;a0){if(o==l.length-1)return null;i=s+l[o].size-t,o++}else i=s-t;t+=i,r+=i}for(;Rt(e.doc,r)!=r;){if(o==(n<0?0:l.length-1))return null;r+=n*l[o-(n<0?1:0)].size,o+=n}return{index:o,lineN:r}}function dn(e){for(var t=e.display.view,r=0,n=0;n=e.display.viewTo||s.to().linet||t==r&&l.to==t)&&(n(Math.max(l.from,t),Math.min(l.to,r),1==l.level?"rtl":"ltr",o),i=!0)}i||n(t,r,"ltr")}(g,r||0,null==n?f:n,function(e,t,i,h){var v="ltr"==i,m=d(e,v?"left":"right"),y=d(t-1,v?"right":"left"),b=null==r&&0==e,w=null==n&&t==f,x=0==h,C=!g||h==g.length-1;if(y.top-m.top<=3){var S=(u?w:b)&&C,L=(u?b:w)&&x?s:(v?m:y).left,k=S?a:(v?y:m).right;c(L,m.top,k-L,m.bottom)}else{var T,M,N,O;v?(T=u&&b&&x?s:m.left,M=u?a:p(e,i,"before"),N=u?s:p(t,i,"after"),O=u&&w&&C?a:y.right):(T=u?p(e,i,"before"):s,M=!u&&b&&x?a:m.right,N=!u&&w&&C?s:y.left,O=u?p(t,i,"after"):a),c(T,m.top,M-T,m.bottom),m.bottom0?t.blinker=setInterval(function(){return t.cursorDiv.style.visibility=(r=!r)?"":"hidden"},e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function wn(e){e.state.focused||(e.display.input.focus(),Cn(e))}function xn(e){e.state.delayingBlurEvent=!0,setTimeout(function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,Sn(e))},100)}function Cn(e,t){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(ge(e,"focus",e,t),e.state.focused=!0,H(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),a&&setTimeout(function(){return e.display.input.reset(!0)},20)),e.display.input.receivedFocus()),bn(e))}function Sn(e,t){e.state.delayingBlurEvent||(e.state.focused&&(ge(e,"blur",e,t),e.state.focused=!1,T(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout(function(){e.state.focused||(e.display.shift=!1)},150))}function Ln(e){for(var t=e.display,r=t.lineDiv.offsetTop,n=0;n.005||f<-.005)&&($e(i.line,a),kn(i.line),i.rest))for(var d=0;de.display.sizerWidth){var p=Math.ceil(u/tn(e.display));p>e.display.maxLineLength&&(e.display.maxLineLength=p,e.display.maxLine=i.line,e.display.maxLineChanged=!0)}}}}function kn(e){if(e.widgets)for(var t=0;t=l&&(o=Ze(t,Vt(Xe(t,a))-e.wrapper.clientHeight),l=a)}return{from:o,to:Math.max(l,o+1)}}function Mn(e,t){var r=e.display,n=en(e.display);t.top<0&&(t.top=0);var i=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:r.scroller.scrollTop,o=Mr(e),l={};t.bottom-t.top>o&&(t.bottom=t.top+o);var s=e.doc.height+Sr(r),a=t.tops-n;if(t.topi+o){var c=Math.min(t.top,(u?s:t.bottom)-o);c!=i&&(l.scrollTop=c)}var h=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:r.scroller.scrollLeft,f=Tr(e)-(e.options.fixedGutter?r.gutters.offsetWidth:0),d=t.right-t.left>f;return d&&(t.right=t.left+f),t.left<10?l.scrollLeft=0:t.leftf+h-3&&(l.scrollLeft=t.right+(d?0:10)-f),l}function Nn(e,t){null!=t&&(Dn(e),e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+t)}function On(e){Dn(e);var t=e.getCursor();e.curOp.scrollToPos={from:t,to:t,margin:e.options.cursorScrollMargin}}function An(e,t,r){null==t&&null==r||Dn(e),null!=t&&(e.curOp.scrollLeft=t),null!=r&&(e.curOp.scrollTop=r)}function Dn(e){var t=e.curOp.scrollToPos;t&&(e.curOp.scrollToPos=null,Wn(e,Yr(e,t.from),Yr(e,t.to),t.margin))}function Wn(e,t,r,n){var i=Mn(e,{left:Math.min(t.left,r.left),top:Math.min(t.top,r.top)-n,right:Math.max(t.right,r.right),bottom:Math.max(t.bottom,r.bottom)+n});An(e,i.scrollLeft,i.scrollTop)}function Hn(e,t){Math.abs(e.doc.scrollTop-t)<2||(r||oi(e,{top:t}),Fn(e,t,!0),r&&oi(e),ei(e,100))}function Fn(e,t,r){t=Math.min(e.display.scroller.scrollHeight-e.display.scroller.clientHeight,t),(e.display.scroller.scrollTop!=t||r)&&(e.doc.scrollTop=t,e.display.scrollbars.setScrollTop(t),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t))}function Pn(e,t,r,n){t=Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth),(r?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)&&!n||(e.doc.scrollLeft=t,ai(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}function En(e){var t=e.display,r=t.gutters.offsetWidth,n=Math.round(e.doc.height+Sr(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?r:0,docHeight:n,scrollHeight:n+kr(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:r}}var In=function(e,t,r){this.cm=r;var n=this.vert=O("div",[O("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=O("div",[O("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");n.tabIndex=i.tabIndex=-1,e(n),e(i),fe(n,"scroll",function(){n.clientHeight&&t(n.scrollTop,"vertical")}),fe(i,"scroll",function(){i.clientWidth&&t(i.scrollLeft,"horizontal")}),this.checkedZeroWidth=!1,l&&s<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};In.prototype.update=function(e){var t=e.scrollWidth>e.clientWidth+1,r=e.scrollHeight>e.clientHeight+1,n=e.nativeBarWidth;if(r){this.vert.style.display="block",this.vert.style.bottom=t?n+"px":"0";var i=e.viewHeight-(t?n:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=r?n+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(r?n:0);this.horiz.firstChild.style.width=Math.max(0,e.scrollWidth-e.clientWidth+o)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(0==n&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:r?n:0,bottom:t?n:0}},In.prototype.setScrollLeft=function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},In.prototype.setScrollTop=function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},In.prototype.zeroWidthHack=function(){var e=y&&!d?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new R,this.disableVert=new R},In.prototype.enableZeroWidthBar=function(e,t,r){e.style.pointerEvents="auto",t.set(1e3,function n(){var i=e.getBoundingClientRect();("vert"==r?document.elementFromPoint(i.right-1,(i.top+i.bottom)/2):document.elementFromPoint((i.right+i.left)/2,i.bottom-1))!=e?e.style.pointerEvents="none":t.set(1e3,n)})},In.prototype.clear=function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)};var zn=function(){};function Rn(e,t){t||(t=En(e));var r=e.display.barWidth,n=e.display.barHeight;Bn(e,t);for(var i=0;i<4&&r!=e.display.barWidth||n!=e.display.barHeight;i++)r!=e.display.barWidth&&e.options.lineWrapping&&Ln(e),Bn(e,En(e)),r=e.display.barWidth,n=e.display.barHeight}function Bn(e,t){var r=e.display,n=r.scrollbars.update(t);r.sizer.style.paddingRight=(r.barWidth=n.right)+"px",r.sizer.style.paddingBottom=(r.barHeight=n.bottom)+"px",r.heightForcer.style.borderBottom=n.bottom+"px solid transparent",n.right&&n.bottom?(r.scrollbarFiller.style.display="block",r.scrollbarFiller.style.height=n.bottom+"px",r.scrollbarFiller.style.width=n.right+"px"):r.scrollbarFiller.style.display="",n.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(r.gutterFiller.style.display="block",r.gutterFiller.style.height=n.bottom+"px",r.gutterFiller.style.width=t.gutterWidth+"px"):r.gutterFiller.style.display=""}zn.prototype.update=function(){return{bottom:0,right:0}},zn.prototype.setScrollLeft=function(){},zn.prototype.setScrollTop=function(){},zn.prototype.clear=function(){};var Gn={native:In,null:zn};function Un(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&T(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new Gn[e.options.scrollbarStyle](function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),fe(t,"mousedown",function(){e.state.focused&&setTimeout(function(){return e.display.input.focus()},0)}),t.setAttribute("cm-not-content","true")},function(t,r){"horizontal"==r?Pn(e,t):Hn(e,t)},e),e.display.scrollbars.addClass&&H(e.display.wrapper,e.display.scrollbars.addClass)}var Vn=0;function Kn(e){var t;e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:0,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Vn},t=e.curOp,or?or.ops.push(t):t.ownsGroup=or={ops:[t],delayedCallbacks:[]}}function jn(e){var t=e.curOp;t&&function(e,t){var r=e.ownsGroup;if(r)try{!function(e){var t=e.delayedCallbacks,r=0;do{for(;r=r.viewTo)||r.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new ri(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Yn(e){var t=e.cm,r=t.display;e.updatedDisplay&&Ln(t),e.barMeasure=En(t),r.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=Or(t,r.maxLine,r.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(r.scroller.clientWidth,r.sizer.offsetLeft+e.adjustWidthTo+kr(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,r.sizer.offsetLeft+e.adjustWidthTo-Tr(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=r.input.prepareSelection())}function _n(e){var t=e.cm;null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft(window.innerHeight||document.documentElement.clientHeight)&&(i=!1),null!=i&&!p){var o=O("div","​",null,"position: absolute;\n                         top: "+(t.top-r.viewOffset-Cr(e.display))+"px;\n                         height: "+(t.bottom-t.top+kr(e)+r.barHeight)+"px;\n                         left: "+t.left+"px; width: "+Math.max(2,t.right-t.left)+"px;");e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}}(t,function(e,t,r,n){var i;null==n&&(n=0),e.options.lineWrapping||t!=r||(r="before"==(t=t.ch?et(t.line,"before"==t.sticky?t.ch-1:t.ch,"after"):t).sticky?et(t.line,t.ch+1,"before"):t);for(var o=0;o<5;o++){var l=!1,s=Xr(e,t),a=r&&r!=t?Xr(e,r):s,u=Mn(e,i={left:Math.min(s.left,a.left),top:Math.min(s.top,a.top)-n,right:Math.max(s.left,a.left),bottom:Math.max(s.bottom,a.bottom)+n}),c=e.doc.scrollTop,h=e.doc.scrollLeft;if(null!=u.scrollTop&&(Hn(e,u.scrollTop),Math.abs(e.doc.scrollTop-c)>1&&(l=!0)),null!=u.scrollLeft&&(Pn(e,u.scrollLeft),Math.abs(e.doc.scrollLeft-h)>1&&(l=!0)),!l)break}return i}(t,st(n,e.scrollToPos.from),st(n,e.scrollToPos.to),e.scrollToPos.margin));var i=e.maybeHiddenMarkers,o=e.maybeUnhiddenMarkers;if(i)for(var l=0;l=e.display.viewTo)){var r=+new Date+e.options.workTime,n=dt(e,t.highlightFrontier),i=[];t.iter(n.line,Math.min(t.first+t.size,e.display.viewTo+500),function(o){if(n.line>=e.display.viewFrom){var l=o.styles,s=o.text.length>e.options.maxHighlightLength?Ue(t.mode,n.state):null,a=ht(e,o,n,!0);s&&(n.state=s),o.styles=a.styles;var u=o.styleClasses,c=a.classes;c?o.styleClasses=c:u&&(o.styleClasses=null);for(var h=!l||l.length!=o.styles.length||u!=c&&(!u||!c||u.bgClass!=c.bgClass||u.textClass!=c.textClass),f=0;!h&&fr)return ei(e,e.options.workDelay),!0}),t.highlightFrontier=n.line,t.modeFrontier=Math.max(t.modeFrontier,n.line),i.length&&qn(e,function(){for(var t=0;t=r.viewFrom&&t.visible.to<=r.viewTo&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo)&&r.renderedView==r.view&&0==dn(e))return!1;ui(e)&&(hn(e),t.dims=rn(e));var i=n.first+n.size,o=Math.max(t.visible.from-e.options.viewportMargin,n.first),l=Math.min(i,t.visible.to+e.options.viewportMargin);r.viewFroml&&r.viewTo-l<20&&(l=Math.min(i,r.viewTo)),Ct&&(o=Rt(e.doc,o),l=Bt(e.doc,l));var s=o!=r.viewFrom||l!=r.viewTo||r.lastWrapHeight!=t.wrapperHeight||r.lastWrapWidth!=t.wrapperWidth;!function(e,t,r){var n=e.display;0==n.view.length||t>=n.viewTo||r<=n.viewFrom?(n.view=ir(e,t,r),n.viewFrom=t):(n.viewFrom>t?n.view=ir(e,t,n.viewFrom).concat(n.view):n.viewFromr&&(n.view=n.view.slice(0,an(e,r)))),n.viewTo=r}(e,o,l),r.viewOffset=Vt(Xe(e.doc,r.viewFrom)),e.display.mover.style.top=r.viewOffset+"px";var u=dn(e);if(!s&&0==u&&!t.force&&r.renderedView==r.view&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo))return!1;var c=function(e){if(e.hasFocus())return null;var t=W();if(!t||!D(e.display.lineDiv,t))return null;var r={activeElt:t};if(window.getSelection){var n=window.getSelection();n.anchorNode&&n.extend&&D(e.display.lineDiv,n.anchorNode)&&(r.anchorNode=n.anchorNode,r.anchorOffset=n.anchorOffset,r.focusNode=n.focusNode,r.focusOffset=n.focusOffset)}return r}(e);return u>4&&(r.lineDiv.style.display="none"),function(e,t,r){var n=e.display,i=e.options.lineNumbers,o=n.lineDiv,l=o.firstChild;function s(t){var r=t.nextSibling;return a&&y&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),r}for(var u=n.view,c=n.viewFrom,h=0;h-1&&(d=!1),ur(e,f,c,r)),d&&(M(f.lineNumber),f.lineNumber.appendChild(document.createTextNode(Je(e.options,c)))),l=f.node.nextSibling}else{var p=vr(e,f,c,r);o.insertBefore(p,l)}c+=f.size}for(;l;)l=s(l)}(e,r.updateLineNumbers,t.dims),u>4&&(r.lineDiv.style.display=""),r.renderedView=r.view,function(e){if(e&&e.activeElt&&e.activeElt!=W()&&(e.activeElt.focus(),e.anchorNode&&D(document.body,e.anchorNode)&&D(document.body,e.focusNode))){var t=window.getSelection(),r=document.createRange();r.setEnd(e.anchorNode,e.anchorOffset),r.collapse(!1),t.removeAllRanges(),t.addRange(r),t.extend(e.focusNode,e.focusOffset)}}(c),M(r.cursorDiv),M(r.selectionDiv),r.gutters.style.height=r.sizer.style.minHeight=0,s&&(r.lastWrapHeight=t.wrapperHeight,r.lastWrapWidth=t.wrapperWidth,ei(e,400)),r.updateLineNumbers=null,!0}function ii(e,t){for(var r=t.viewport,n=!0;(n&&e.options.lineWrapping&&t.oldDisplayWidth!=Tr(e)||(r&&null!=r.top&&(r={top:Math.min(e.doc.height+Sr(e.display)-Mr(e),r.top)}),t.visible=Tn(e.display,e.doc,r),!(t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)))&&ni(e,t);n=!1){Ln(e);var i=En(e);pn(e),Rn(e,i),si(e,i),t.force=!1}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function oi(e,t){var r=new ri(e,t);if(ni(e,r)){Ln(e),ii(e,r);var n=En(e);pn(e),Rn(e,n),si(e,n),r.finish()}}function li(e){var t=e.gutters.offsetWidth;e.sizer.style.marginLeft=t+"px"}function si(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+kr(e)+"px"}function ai(e){var t=e.display,r=t.view;if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var n=nn(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=n+"px",l=0;ls.clientWidth,c=s.scrollHeight>s.clientHeight;if(i&&u||o&&c){if(o&&y&&a)e:for(var f=t.target,d=l.view;f!=s;f=f.parentNode)for(var p=0;p=0&&tt(e,n.to())<=0)return r}return-1};var bi=function(e,t){this.anchor=e,this.head=t};function wi(e,t,r){var n=e&&e.options.selectionsMayTouch,i=t[r];t.sort(function(e,t){return tt(e.from(),t.from())}),r=B(t,i);for(var o=1;o0:a>=0){var u=ot(s.from(),l.from()),c=it(s.to(),l.to()),h=s.empty()?l.from()==l.head:s.from()==s.head;o<=r&&--r,t.splice(--o,2,new bi(h?c:u,h?u:c))}}return new yi(t,r)}function xi(e,t){return new yi([new bi(e,t||e)],0)}function Ci(e){return e.text?et(e.from.line+e.text.length-1,$(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}function Si(e,t){if(tt(e,t.from)<0)return e;if(tt(e,t.to)<=0)return Ci(t);var r=e.line+t.text.length-(t.to.line-t.from.line)-1,n=e.ch;return e.line==t.to.line&&(n+=Ci(t).ch-t.to.ch),et(r,n)}function Li(e,t){for(var r=[],n=0;n1&&e.remove(s.line+1,p-1),e.insert(s.line+1,m)}sr(e,"change",e,t)}function Ai(e,t,r){!function e(n,i,o){if(n.linked)for(var l=0;ls-(e.cm?e.cm.options.historyEventDelay:500)||"*"==t.origin.charAt(0)))&&(o=function(e,t){return t?(Pi(e.done),$(e.done)):e.done.length&&!$(e.done).ranges?$(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),$(e.done)):void 0}(i,i.lastOp==n)))l=$(o.changes),0==tt(t.from,t.to)&&0==tt(t.from,l.to)?l.to=Ci(t):o.changes.push(Fi(e,t));else{var a=$(i.done);for(a&&a.ranges||zi(e.sel,i.done),o={changes:[Fi(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(r),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=s,i.lastOp=i.lastSelOp=n,i.lastOrigin=i.lastSelOrigin=t.origin,l||ge(e,"historyAdded")}function Ii(e,t,r,n){var i=e.history,o=n&&n.origin;r==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||function(e,t,r,n){var i=t.charAt(0);return"*"==i||"+"==i&&r.ranges.length==n.ranges.length&&r.somethingSelected()==n.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}(e,o,$(i.done),t))?i.done[i.done.length-1]=t:zi(t,i.done),i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=r,n&&!1!==n.clearRedo&&Pi(i.undone)}function zi(e,t){var r=$(t);r&&r.ranges&&r.equals(e)||t.push(e)}function Ri(e,t,r,n){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,r),Math.min(e.first+e.size,n),function(r){r.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=r.markedSpans),++o})}function Bi(e){if(!e)return null;for(var t,r=0;r-1&&($(s)[h]=u[h],delete u[h])}}}return n}function Vi(e,t,r,n){if(n){var i=e.anchor;if(r){var o=tt(t,i)<0;o!=tt(r,i)<0?(i=t,t=r):o!=tt(t,r)<0&&(t=r)}return new bi(i,t)}return new bi(r||t,t)}function Ki(e,t,r,n,i){null==i&&(i=e.cm&&(e.cm.display.shift||e.extend)),$i(e,new yi([Vi(e.sel.primary(),t,r,i)],0),n)}function ji(e,t,r){for(var n=[],i=e.cm&&(e.cm.display.shift||e.extend),o=0;o=t.ch:s.to>t.ch))){if(i&&(ge(a,"beforeCursorEnter"),a.explicitlyCleared)){if(o.markedSpans){--l;continue}break}if(!a.atomic)continue;if(r){var h=a.find(n<0?1:-1),f=void 0;if((n<0?c:u)&&(h=ro(e,h,-n,h&&h.line==t.line?o:null)),h&&h.line==t.line&&(f=tt(h,r))&&(n<0?f<0:f>0))return eo(e,h,t,n,i)}var d=a.find(n<0?-1:1);return(n<0?u:c)&&(d=ro(e,d,n,d.line==t.line?o:null)),d?eo(e,d,t,n,i):null}}return t}function to(e,t,r,n,i){var o=n||1,l=eo(e,t,r,o,i)||!i&&eo(e,t,r,o,!0)||eo(e,t,r,-o,i)||!i&&eo(e,t,r,-o,!0);return l||(e.cantEdit=!0,et(e.first,0))}function ro(e,t,r,n){return r<0&&0==t.ch?t.line>e.first?st(e,et(t.line-1)):null:r>0&&t.ch==(n||Xe(e,t.line)).text.length?t.line0)){var c=[a,1],h=tt(u.from,s.from),f=tt(u.to,s.to);(h<0||!l.inclusiveLeft&&!h)&&c.push({from:u.from,to:s.from}),(f>0||!l.inclusiveRight&&!f)&&c.push({from:s.to,to:u.to}),i.splice.apply(i,c),a+=c.length-3}}return i}(e,t.from,t.to);if(n)for(var i=n.length-1;i>=0;--i)lo(e,{from:n[i].from,to:n[i].to,text:i?[""]:t.text,origin:t.origin});else lo(e,t)}}function lo(e,t){if(1!=t.text.length||""!=t.text[0]||0!=tt(t.from,t.to)){var r=Li(e,t);Ei(e,t,r,e.cm?e.cm.curOp.id:NaN),uo(e,t,r,Tt(e,t));var n=[];Ai(e,function(e,r){r||-1!=B(n,e.history)||(po(e.history,t),n.push(e.history)),uo(e,t,null,Tt(e,t))})}}function so(e,t,r){var n=e.cm&&e.cm.state.suppressEdits;if(!n||r){for(var i,o=e.history,l=e.sel,s="undo"==t?o.done:o.undone,a="undo"==t?o.undone:o.done,u=0;u=0;--d){var p=f(d);if(p)return p.v}}}}function ao(e,t){if(0!=t&&(e.first+=t,e.sel=new yi(q(e.sel.ranges,function(e){return new bi(et(e.anchor.line+t,e.anchor.ch),et(e.head.line+t,e.head.ch))}),e.sel.primIndex),e.cm)){un(e.cm,e.first,e.first-t,t);for(var r=e.cm.display,n=r.viewFrom;ne.lastLine())){if(t.from.lineo&&(t={from:t.from,to:et(o,Xe(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=Ye(e,t.from,t.to),r||(r=Li(e,t)),e.cm?function(e,t,r){var n=e.doc,i=e.display,o=t.from,l=t.to,s=!1,a=o.line;e.options.lineWrapping||(a=qe(zt(Xe(n,o.line))),n.iter(a,l.line+1,function(e){if(e==i.maxLine)return s=!0,!0}));n.sel.contains(t.from,t.to)>-1&&me(e);Oi(n,t,r,on(e)),e.options.lineWrapping||(n.iter(a,o.line+t.text.length,function(e){var t=Kt(e);t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,s=!1)}),s&&(e.curOp.updateMaxLine=!0));(function(e,t){if(e.modeFrontier=Math.min(e.modeFrontier,t),!(e.highlightFrontierr;n--){var i=Xe(e,n).stateAfter;if(i&&(!(i instanceof ut)||n+i.lookAhead1||!(this.children[0]instanceof vo))){var s=[];this.collapse(s),this.children=[new vo(s)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t50){for(var l=i.lines.length%25+25,s=l;s10);e.parent.maybeSpill()}},iterN:function(e,t,r){for(var n=0;n0||0==l&&!1!==o.clearWhenEmpty)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=A("span",[o.replacedWith],"CodeMirror-widget"),n.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),n.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(It(e,t.line,t,r,o)||t.line!=r.line&&It(e,r.line,t,r,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");Ct=!0}o.addToHistory&&Ei(e,{from:t,to:r,origin:"markText"},e.sel,NaN);var s,a=t.line,u=e.cm;if(e.iter(a,r.line+1,function(e){u&&o.collapsed&&!u.options.lineWrapping&&zt(e)==u.display.maxLine&&(s=!0),o.collapsed&&a!=t.line&&$e(e,0),function(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}(e,new St(o,a==t.line?t.ch:null,a==r.line?r.ch:null)),++a}),o.collapsed&&e.iter(t.line,r.line+1,function(t){Gt(e,t)&&$e(t,0)}),o.clearOnEnter&&fe(o,"beforeCursorEnter",function(){return o.clear()}),o.readOnly&&(xt=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++wo,o.atomic=!0),u){if(s&&(u.curOp.updateMaxLine=!0),o.collapsed)un(u,t.line,r.line+1);else if(o.className||o.startStyle||o.endStyle||o.css||o.attributes||o.title)for(var c=t.line;c<=r.line;c++)cn(u,c,"text");o.atomic&&Qi(u.doc),sr(u,"markerAdded",u,o)}return o}xo.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp;if(t&&Kn(e),ye(this,"clear")){var r=this.find();r&&sr(this,"clear",r.from,r.to)}for(var n=null,i=null,o=0;oe.display.maxLineLength&&(e.display.maxLine=u,e.display.maxLineLength=c,e.display.maxLineChanged=!0)}null!=n&&e&&this.collapsed&&un(e,n,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&Qi(e.doc)),e&&sr(e,"markerCleared",e,this,n,i),t&&jn(e),this.parent&&this.parent.clear()}},xo.prototype.find=function(e,t){var r,n;null==e&&"bookmark"==this.type&&(e=1);for(var i=0;i=0;a--)oo(this,n[a]);s?_i(this,s):this.cm&&On(this.cm)}),undo:Jn(function(){so(this,"undo")}),redo:Jn(function(){so(this,"redo")}),undoSelection:Jn(function(){so(this,"undo",!0)}),redoSelection:Jn(function(){so(this,"redo",!0)}),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,r=0,n=0;n=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,r){e=st(this,e),t=st(this,t);var n=[],i=e.line;return this.iter(e.line,t.line+1,function(o){var l=o.markedSpans;if(l)for(var s=0;s=a.to||null==a.from&&i!=e.line||null!=a.from&&i==t.line&&a.from>=t.ch||r&&!r(a.marker)||n.push(a.marker.parent||a.marker)}++i}),n},getAllMarks:function(){var e=[];return this.iter(function(t){var r=t.markedSpans;if(r)for(var n=0;ne)return t=e,!0;e-=o,++r}),st(this,et(r,t))},indexFromPos:function(e){var t=(e=st(this,e)).ch;if(e.linet&&(t=e.from),null!=e.to&&e.to-1)return t.state.draggingText(e),void setTimeout(function(){return t.display.input.focus()},20);try{var c=e.dataTransfer.getData("Text");if(c){var h;if(t.state.draggingText&&!t.state.draggingText.copy&&(h=t.listSelections()),qi(t.doc,xi(r,r)),h)for(var f=0;f=0;t--)co(e.doc,"",n[t].from,n[t].to,"+delete");On(e)})}function _o(e,t,r){var n=oe(e.text,t+r,r);return n<0||n>e.text.length?null:n}function $o(e,t,r){var n=_o(e,t.ch,r);return null==n?null:new et(t.line,n,r<0?"after":"before")}function qo(e,t,r,n,i){if(e){var o=ce(r,t.doc.direction);if(o){var l,s=i<0?$(o):o[0],a=i<0==(1==s.level)?"after":"before";if(s.level>0||"rtl"==t.doc.direction){var u=Dr(t,r);l=i<0?r.text.length-1:0;var c=Wr(t,u,l).top;l=le(function(e){return Wr(t,u,e).top==c},i<0==(1==s.level)?s.from:s.to-1,l),"before"==a&&(l=_o(r,l,1))}else l=i<0?s.to:s.from;return new et(n,l,a)}}return new et(n,i<0?r.text.length:0,i<0?"before":"after")}Ro.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},Ro.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},Ro.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},Ro.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},Ro.default=y?Ro.macDefault:Ro.pcDefault;var Zo={selectAll:no,singleSelection:function(e){return e.setSelection(e.getCursor("anchor"),e.getCursor("head"),V)},killLine:function(e){return Yo(e,function(t){if(t.empty()){var r=Xe(e.doc,t.head.line).text.length;return t.head.ch==r&&t.head.line0)i=new et(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),et(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var l=Xe(e.doc,i.line-1).text;l&&(i=new et(i.line,1),e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+l.charAt(l.length-1),et(i.line-1,l.length-1),i,"+transpose"))}r.push(new bi(i,i))}e.setSelections(r)})},newlineAndIndent:function(e){return qn(e,function(){for(var t=e.listSelections(),r=t.length-1;r>=0;r--)e.replaceRange(e.doc.lineSeparator(),t[r].anchor,t[r].head,"+input");t=e.listSelections();for(var n=0;n-1&&(tt((i=u.ranges[i]).from(),t)<0||t.xRel>0)&&(tt(i.to(),t)>0||t.xRel<0)?function(e,t,r,n){var i=e.display,o=!1,u=Zn(e,function(t){a&&(i.scroller.draggable=!1),e.state.draggingText=!1,pe(i.wrapper.ownerDocument,"mouseup",u),pe(i.wrapper.ownerDocument,"mousemove",c),pe(i.scroller,"dragstart",h),pe(i.scroller,"drop",u),o||(we(t),n.addNew||Ki(e.doc,r,null,null,n.extend),a||l&&9==s?setTimeout(function(){i.wrapper.ownerDocument.body.focus(),i.input.focus()},20):i.input.focus())}),c=function(e){o=o||Math.abs(t.clientX-e.clientX)+Math.abs(t.clientY-e.clientY)>=10},h=function(){return o=!0};a&&(i.scroller.draggable=!0);e.state.draggingText=u,u.copy=!n.moveOnDrag,i.scroller.dragDrop&&i.scroller.dragDrop();fe(i.wrapper.ownerDocument,"mouseup",u),fe(i.wrapper.ownerDocument,"mousemove",c),fe(i.scroller,"dragstart",h),fe(i.scroller,"drop",u),xn(e),setTimeout(function(){return i.input.focus()},20)}(e,n,t,o):function(e,t,r,n){var i=e.display,o=e.doc;we(t);var l,s,a=o.sel,u=a.ranges;n.addNew&&!n.extend?(s=o.sel.contains(r),l=s>-1?u[s]:new bi(r,r)):(l=o.sel.primary(),s=o.sel.primIndex);if("rectangle"==n.unit)n.addNew||(l=new bi(r,r)),r=sn(e,t,!0,!0),s=-1;else{var c=dl(e,r,n.unit);l=n.extend?Vi(l,c.anchor,c.head,n.extend):c}n.addNew?-1==s?(s=u.length,$i(o,wi(e,u.concat([l]),s),{scroll:!1,origin:"*mouse"})):u.length>1&&u[s].empty()&&"char"==n.unit&&!n.extend?($i(o,wi(e,u.slice(0,s).concat(u.slice(s+1)),0),{scroll:!1,origin:"*mouse"}),a=o.sel):Xi(o,s,l,K):(s=0,$i(o,new yi([l],0),K),a=o.sel);var h=r;function f(t){if(0!=tt(h,t))if(h=t,"rectangle"==n.unit){for(var i=[],u=e.options.tabSize,c=z(Xe(o,r.line).text,r.ch,u),f=z(Xe(o,t.line).text,t.ch,u),d=Math.min(c,f),p=Math.max(c,f),g=Math.min(r.line,t.line),v=Math.min(e.lastLine(),Math.max(r.line,t.line));g<=v;g++){var m=Xe(o,g).text,y=X(m,d,u);d==p?i.push(new bi(et(g,y),et(g,y))):m.length>y&&i.push(new bi(et(g,y),et(g,X(m,p,u))))}i.length||i.push(new bi(r,r)),$i(o,wi(e,a.ranges.slice(0,s).concat(i),s),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var b,w=l,x=dl(e,t,n.unit),C=w.anchor;tt(x.anchor,C)>0?(b=x.head,C=ot(w.from(),x.anchor)):(b=x.anchor,C=it(w.to(),x.head));var S=a.ranges.slice(0);S[s]=function(e,t){var r=t.anchor,n=t.head,i=Xe(e.doc,r.line);if(0==tt(r,n)&&r.sticky==n.sticky)return t;var o=ce(i);if(!o)return t;var l=ae(o,r.ch,r.sticky),s=o[l];if(s.from!=r.ch&&s.to!=r.ch)return t;var a,u=l+(s.from==r.ch==(1!=s.level)?0:1);if(0==u||u==o.length)return t;if(n.line!=r.line)a=(n.line-r.line)*("ltr"==e.doc.direction?1:-1)>0;else{var c=ae(o,n.ch,n.sticky),h=c-l||(n.ch-r.ch)*(1==s.level?-1:1);a=c==u-1||c==u?h<0:h>0}var f=o[u+(a?-1:0)],d=a==(1==f.level),p=d?f.from:f.to,g=d?"after":"before";return r.ch==p&&r.sticky==g?t:new bi(new et(r.line,p,g),n)}(e,new bi(st(o,C),b)),$i(o,wi(e,S,s),K)}}var d=i.wrapper.getBoundingClientRect(),p=0;function g(t){e.state.selectingText=!1,p=1/0,t&&(we(t),i.input.focus()),pe(i.wrapper.ownerDocument,"mousemove",v),pe(i.wrapper.ownerDocument,"mouseup",m),o.history.lastSelOrigin=null}var v=Zn(e,function(t){0!==t.buttons&&ke(t)?function t(r){var l=++p;var s=sn(e,r,!0,"rectangle"==n.unit);if(!s)return;if(0!=tt(s,h)){e.curOp.focus=W(),f(s);var a=Tn(i,o);(s.line>=a.to||s.lined.bottom?20:0;u&&setTimeout(Zn(e,function(){p==l&&(i.scroller.scrollTop+=u,t(r))}),50)}}(t):g(t)}),m=Zn(e,g);e.state.selectingText=m,fe(i.wrapper.ownerDocument,"mousemove",v),fe(i.wrapper.ownerDocument,"mouseup",m)}(e,n,t,o)}(t,n,o,e):Le(e)==r.scroller&&we(e):2==i?(n&&Ki(t.doc,n),setTimeout(function(){return r.input.focus()},20)):3==i&&(S?t.display.input.onContextMenu(e):xn(t)))}}function dl(e,t,r){if("char"==r)return new bi(t,t);if("word"==r)return e.findWordAt(t);if("line"==r)return new bi(et(t.line,0),st(e.doc,et(t.line+1,0)));var n=r(e,t);return new bi(n.from,n.to)}function pl(e,t,r,n){var i,o;if(t.touches)i=t.touches[0].clientX,o=t.touches[0].clientY;else try{i=t.clientX,o=t.clientY}catch(t){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;n&&we(t);var l=e.display,s=l.lineDiv.getBoundingClientRect();if(o>s.bottom||!ye(e,r))return Ce(t);o-=s.top-l.viewOffset;for(var a=0;a=i)return ge(e,r,e,Ze(e.doc,o),e.display.gutterSpecs[a].className,t),Ce(t)}}function gl(e,t){return pl(e,t,"gutterClick",!0)}function vl(e,t){xr(e.display,t)||function(e,t){if(!ye(e,"gutterContextMenu"))return!1;return pl(e,t,"gutterContextMenu",!1)}(e,t)||ve(e,t,"contextmenu")||S||e.display.input.onContextMenu(t)}function ml(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Rr(e)}hl.prototype.compare=function(e,t,r){return this.time+400>e&&0==tt(t,this.pos)&&r==this.button};var yl={toString:function(){return"CodeMirror.Init"}},bl={},wl={};function xl(e,t,r){if(!t!=!(r&&r!=yl)){var n=e.display.dragFunctions,i=t?fe:pe;i(e.display.scroller,"dragstart",n.start),i(e.display.scroller,"dragenter",n.enter),i(e.display.scroller,"dragover",n.over),i(e.display.scroller,"dragleave",n.leave),i(e.display.scroller,"drop",n.drop)}}function Cl(e){e.options.lineWrapping?(H(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(T(e.display.wrapper,"CodeMirror-wrap"),jt(e)),ln(e),un(e),Rr(e),setTimeout(function(){return Rn(e)},100)}function Sl(e,t){var n=this;if(!(this instanceof Sl))return new Sl(e,t);this.options=t=t?I(t):{},I(bl,t,!1);var i=t.value;"string"==typeof i?i=new Mo(i,t.mode,null,t.lineSeparator,t.direction):t.mode&&(i.modeOption=t.mode),this.doc=i;var o=new Sl.inputStyles[t.inputStyle](this),u=this.display=new function(e,t,n,i){var o=this;this.input=n,o.scrollbarFiller=O("div",null,"CodeMirror-scrollbar-filler"),o.scrollbarFiller.setAttribute("cm-not-content","true"),o.gutterFiller=O("div",null,"CodeMirror-gutter-filler"),o.gutterFiller.setAttribute("cm-not-content","true"),o.lineDiv=A("div",null,"CodeMirror-code"),o.selectionDiv=O("div",null,null,"position: relative; z-index: 1"),o.cursorDiv=O("div",null,"CodeMirror-cursors"),o.measure=O("div",null,"CodeMirror-measure"),o.lineMeasure=O("div",null,"CodeMirror-measure"),o.lineSpace=A("div",[o.measure,o.lineMeasure,o.selectionDiv,o.cursorDiv,o.lineDiv],null,"position: relative; outline: none");var u=A("div",[o.lineSpace],"CodeMirror-lines");o.mover=O("div",[u],null,"position: relative"),o.sizer=O("div",[o.mover],"CodeMirror-sizer"),o.sizerWidth=null,o.heightForcer=O("div",null,null,"position: absolute; height: "+G+"px; width: 1px;"),o.gutters=O("div",null,"CodeMirror-gutters"),o.lineGutter=null,o.scroller=O("div",[o.sizer,o.heightForcer,o.gutters],"CodeMirror-scroll"),o.scroller.setAttribute("tabIndex","-1"),o.wrapper=O("div",[o.scrollbarFiller,o.gutterFiller,o.scroller],"CodeMirror"),l&&s<8&&(o.gutters.style.zIndex=-1,o.scroller.style.paddingRight=0),a||r&&m||(o.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(o.wrapper):e(o.wrapper)),o.viewFrom=o.viewTo=t.first,o.reportedViewFrom=o.reportedViewTo=t.first,o.view=[],o.renderedView=null,o.externalMeasured=null,o.viewOffset=0,o.lastWrapHeight=o.lastWrapWidth=0,o.updateLineNumbers=null,o.nativeBarWidth=o.barHeight=o.barWidth=0,o.scrollbarsClipped=!1,o.lineNumWidth=o.lineNumInnerWidth=o.lineNumChars=null,o.alignWidgets=!1,o.cachedCharWidth=o.cachedTextHeight=o.cachedPaddingH=null,o.maxLine=null,o.maxLineLength=0,o.maxLineChanged=!1,o.wheelDX=o.wheelDY=o.wheelStartX=o.wheelStartY=null,o.shift=!1,o.selForContextMenu=null,o.activeTouch=null,o.gutterSpecs=ci(i.gutters,i.lineNumbers),hi(o),n.init(o)}(e,i,o,t);for(var c in u.wrapper.CodeMirror=this,ml(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),Un(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:-1,cutIncoming:-1,selectingText:!1,draggingText:!1,highlight:new R,keySeq:null,specialChars:null},t.autofocus&&!m&&u.input.focus(),l&&s<11&&setTimeout(function(){return n.display.input.reset(!0)},20),function(e){var t=e.display;fe(t.scroller,"mousedown",Zn(e,fl)),fe(t.scroller,"dblclick",l&&s<11?Zn(e,function(t){if(!ve(e,t)){var r=sn(e,t);if(r&&!gl(e,t)&&!xr(e.display,t)){we(t);var n=e.findWordAt(r);Ki(e.doc,n.anchor,n.head)}}}):function(t){return ve(e,t)||we(t)});fe(t.scroller,"contextmenu",function(t){return vl(e,t)});var r,n={end:0};function i(){t.activeTouch&&(r=setTimeout(function(){return t.activeTouch=null},1e3),(n=t.activeTouch).end=+new Date)}function o(e,t){if(null==t.left)return!0;var r=t.left-e.left,n=t.top-e.top;return r*r+n*n>400}fe(t.scroller,"touchstart",function(i){if(!ve(e,i)&&!function(e){if(1!=e.touches.length)return!1;var t=e.touches[0];return t.radiusX<=1&&t.radiusY<=1}(i)&&!gl(e,i)){t.input.ensurePolled(),clearTimeout(r);var o=+new Date;t.activeTouch={start:o,moved:!1,prev:o-n.end<=300?n:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}}),fe(t.scroller,"touchmove",function(){t.activeTouch&&(t.activeTouch.moved=!0)}),fe(t.scroller,"touchend",function(r){var n=t.activeTouch;if(n&&!xr(t,r)&&null!=n.left&&!n.moved&&new Date-n.start<300){var l,s=e.coordsChar(t.activeTouch,"page");l=!n.prev||o(n,n.prev)?new bi(s,s):!n.prev.prev||o(n,n.prev.prev)?e.findWordAt(s):new bi(et(s.line,0),st(e.doc,et(s.line+1,0))),e.setSelection(l.anchor,l.head),e.focus(),we(r)}i()}),fe(t.scroller,"touchcancel",i),fe(t.scroller,"scroll",function(){t.scroller.clientHeight&&(Hn(e,t.scroller.scrollTop),Pn(e,t.scroller.scrollLeft,!0),ge(e,"scroll",e))}),fe(t.scroller,"mousewheel",function(t){return mi(e,t)}),fe(t.scroller,"DOMMouseScroll",function(t){return mi(e,t)}),fe(t.wrapper,"scroll",function(){return t.wrapper.scrollTop=t.wrapper.scrollLeft=0}),t.dragFunctions={enter:function(t){ve(e,t)||Se(t)},over:function(t){ve(e,t)||(!function(e,t){var r=sn(e,t);if(r){var n=document.createDocumentFragment();vn(e,r,n),e.display.dragCursor||(e.display.dragCursor=O("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),N(e.display.dragCursor,n)}}(e,t),Se(t))},start:function(t){return function(e,t){if(l&&(!e.state.draggingText||+new Date-No<100))Se(t);else if(!ve(e,t)&&!xr(e.display,t)&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!f)){var r=O("img",null,null,"position: fixed; left: 0; top: 0;");r.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",h&&(r.width=r.height=1,e.display.wrapper.appendChild(r),r._top=r.offsetTop),t.dataTransfer.setDragImage(r,0,0),h&&r.parentNode.removeChild(r)}}(e,t)},drop:Zn(e,Oo),leave:function(t){ve(e,t)||Ao(e)}};var a=t.input.getField();fe(a,"keyup",function(t){return sl.call(e,t)}),fe(a,"keydown",Zn(e,ll)),fe(a,"keypress",Zn(e,al)),fe(a,"focus",function(t){return Cn(e,t)}),fe(a,"blur",function(t){return Sn(e,t)})}(this),Ho(),Kn(this),this.curOp.forceUpdate=!0,Di(this,i),t.autofocus&&!m||this.hasFocus()?setTimeout(E(Cn,this),20):Sn(this),wl)wl.hasOwnProperty(c)&&wl[c](n,t[c],yl);ui(this),t.finishInit&&t.finishInit(this);for(var d=0;d150)){if(!n)return;r="prev"}}else u=0,r="not";"prev"==r?u=t>o.first?z(Xe(o,t-1).text,null,l):0:"add"==r?u=a+e.options.indentUnit:"subtract"==r?u=a-e.options.indentUnit:"number"==typeof r&&(u=a+r),u=Math.max(0,u);var h="",f=0;if(e.options.indentWithTabs)for(var d=Math.floor(u/l);d;--d)f+=l,h+="\t";if(fl,a=We(t),u=null;if(s&&n.ranges.length>1)if(Tl&&Tl.text.join("\n")==t){if(n.ranges.length%Tl.text.length==0){u=[];for(var c=0;c=0;f--){var d=n.ranges[f],p=d.from(),g=d.to();d.empty()&&(r&&r>0?p=et(p.line,p.ch-r):e.state.overwrite&&!s?g=et(g.line,Math.min(Xe(o,g.line).text.length,g.ch+$(a).length)):s&&Tl&&Tl.lineWise&&Tl.text.join("\n")==t&&(p=g=et(p.line,0)));var v={from:p,to:g,text:u?u[f%u.length]:a,origin:i||(s?"paste":e.state.cutIncoming>l?"cut":"+input")};oo(e.doc,v),sr(e,"inputRead",e,v)}t&&!s&&Al(e,t),On(e),e.curOp.updateInput<2&&(e.curOp.updateInput=h),e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=-1}function Ol(e,t){var r=e.clipboardData&&e.clipboardData.getData("Text");if(r)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||qn(t,function(){return Nl(t,r,0,null,"paste")}),!0}function Al(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var r=e.doc.sel,n=r.ranges.length-1;n>=0;n--){var i=r.ranges[n];if(!(i.head.ch>100||n&&r.ranges[n-1].head.line==i.head.line)){var o=e.getModeAt(i.head),l=!1;if(o.electricChars){for(var s=0;s-1){l=kl(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(Xe(e.doc,i.head.line).text.slice(0,i.head.ch))&&(l=kl(e,i.head.line,"smart"));l&&sr(e,"electricInput",e,i.head.line)}}}function Dl(e){for(var t=[],r=[],n=0;n=t.text.length?(r.ch=t.text.length,r.sticky="before"):r.ch<=0&&(r.ch=0,r.sticky="after");var o=ae(i,r.ch,r.sticky),l=i[o];if("ltr"==e.doc.direction&&l.level%2==0&&(n>0?l.to>r.ch:l.from=l.from&&f>=c.begin)){var d=h?"before":"after";return new et(r.line,f,d)}}var p=function(e,t,n){for(var o=function(e,t){return t?new et(r.line,a(e,1),"before"):new et(r.line,e,"after")};e>=0&&e0==(1!=l.level),u=s?n.begin:a(n.end,-1);if(l.from<=u&&u0?c.end:a(c.begin,-1);return null==v||n>0&&v==t.text.length||!(g=p(n>0?0:i.length-1,n,u(v)))?null:g}(e.cm,s,t,r):$o(s,t,r))){if(n||(l=t.line+r)=e.first+e.size||(t=new et(l,t.ch,t.sticky),!(s=Xe(e,l))))return!1;t=qo(i,e.cm,s,t.line,r)}else t=o;return!0}if("char"==n)a();else if("column"==n)a(!0);else if("word"==n||"group"==n)for(var u=null,c="group"==n,h=e.cm&&e.cm.getHelper(t,"wordChars"),f=!0;!(r<0)||a(!f);f=!1){var d=s.text.charAt(t.ch)||"\n",p=te(d,h)?"w":c&&"\n"==d?"n":!c||/\s/.test(d)?null:"p";if(!c||f||p||(p="s"),u&&u!=p){r<0&&(r=1,a(),t.sticky="after");break}if(p&&(u=p),r>0&&!a(!f))break}var g=to(e,t,o,l,!0);return rt(o,g)&&(g.hitSide=!0),g}function Pl(e,t,r,n){var i,o,l=e.doc,s=t.left;if("page"==n){var a=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),u=Math.max(a-.5*en(e.display),3);i=(r>0?t.bottom:t.top)+r*u}else"line"==n&&(i=r>0?t.bottom+3:t.top-3);for(;(o=$r(e,s,i)).outside;){if(r<0?i<=0:i>=l.height){o.hitSide=!0;break}i+=5*r}return o}var El=function(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new R,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};function Il(e,t){var r=Ar(e,t.line);if(!r||r.hidden)return null;var n=Xe(e.doc,t.line),i=Nr(r,n,t.line),o=ce(n,e.doc.direction),l="left";o&&(l=ae(o,t.ch)%2?"right":"left");var s=Pr(i.map,t.ch,l);return s.offset="right"==s.collapse?s.end:s.start,s}function zl(e,t){return t&&(e.bad=!0),e}function Rl(e,t,r){var n;if(t==e.display.lineDiv){if(!(n=e.display.lineDiv.childNodes[r]))return zl(e.clipPos(et(e.display.viewTo-1)),!0);t=null,r=0}else for(n=t;;n=n.parentNode){if(!n||n==e.display.lineDiv)return null;if(n.parentNode&&n.parentNode==e.display.lineDiv)break}for(var i=0;i=t.display.viewTo||o.line=t.display.viewFrom&&Il(t,i)||{node:a[0].measure.map[2],offset:0},c=o.linen.firstLine()&&(l=et(l.line-1,Xe(n.doc,l.line-1).length)),s.ch==Xe(n.doc,s.line).text.length&&s.linei.viewTo-1)return!1;l.line==i.viewFrom||0==(e=an(n,l.line))?(t=qe(i.view[0].line),r=i.view[0].node):(t=qe(i.view[e].line),r=i.view[e-1].node.nextSibling);var a,u,c=an(n,s.line);if(c==i.view.length-1?(a=i.viewTo-1,u=i.lineDiv.lastChild):(a=qe(i.view[c+1].line)-1,u=i.view[c+1].node.previousSibling),!r)return!1;for(var h=n.doc.splitLines(function(e,t,r,n,i){var o="",l=!1,s=e.doc.lineSeparator(),a=!1;function u(){l&&(o+=s,a&&(o+=s),l=a=!1)}function c(e){e&&(u(),o+=e)}function h(t){if(1==t.nodeType){var r=t.getAttribute("cm-text");if(r)return void c(r);var o,f=t.getAttribute("cm-marker");if(f){var d=e.findMarks(et(n,0),et(i+1,0),(v=+f,function(e){return e.id==v}));return void(d.length&&(o=d[0].find(0))&&c(Ye(e.doc,o.from,o.to).join(s)))}if("false"==t.getAttribute("contenteditable"))return;var p=/^(pre|div|p|li|table|br)$/i.test(t.nodeName);if(!/^br$/i.test(t.nodeName)&&0==t.textContent.length)return;p&&u();for(var g=0;g1&&f.length>1;)if($(h)==$(f))h.pop(),f.pop(),a--;else{if(h[0]!=f[0])break;h.shift(),f.shift(),t++}for(var d=0,p=0,g=h[0],v=f[0],m=Math.min(g.length,v.length);dl.ch&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)d--,p++;h[h.length-1]=y.slice(0,y.length-p).replace(/^\u200b+/,""),h[0]=h[0].slice(d).replace(/\u200b+$/,"");var x=et(t,d),C=et(a,f.length?$(f).length-p:0);return h.length>1||h[0]||tt(x,C)?(co(n.doc,h,x,C,"+input"),!0):void 0},El.prototype.ensurePolled=function(){this.forceCompositionEnd()},El.prototype.reset=function(){this.forceCompositionEnd()},El.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},El.prototype.readFromDOMSoon=function(){var e=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout(function(){if(e.readDOMTimeout=null,e.composing){if(!e.composing.done)return;e.composing=null}e.updateFromDOM()},80))},El.prototype.updateFromDOM=function(){var e=this;!this.cm.isReadOnly()&&this.pollContent()||qn(this.cm,function(){return un(e.cm)})},El.prototype.setUneditable=function(e){e.contentEditable="false"},El.prototype.onKeyPress=function(e){0==e.charCode||this.composing||(e.preventDefault(),this.cm.isReadOnly()||Zn(this.cm,Nl)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0))},El.prototype.readOnlyChanged=function(e){this.div.contentEditable=String("nocursor"!=e)},El.prototype.onContextMenu=function(){},El.prototype.resetPosition=function(){},El.prototype.needsContentAttribute=!0;var Gl=function(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new R,this.hasSelection=!1,this.composing=null};Gl.prototype.init=function(e){var t=this,r=this,n=this.cm;this.createField(e);var i=this.textarea;function o(e){if(!ve(n,e)){if(n.somethingSelected())Ml({lineWise:!1,text:n.getSelections()});else{if(!n.options.lineWiseCopyCut)return;var t=Dl(n);Ml({lineWise:!0,text:t.text}),"cut"==e.type?n.setSelections(t.ranges,null,V):(r.prevInput="",i.value=t.text.join("\n"),P(i))}"cut"==e.type&&(n.state.cutIncoming=+new Date)}}e.wrapper.insertBefore(this.wrapper,e.wrapper.firstChild),g&&(i.style.width="0px"),fe(i,"input",function(){l&&s>=9&&t.hasSelection&&(t.hasSelection=null),r.poll()}),fe(i,"paste",function(e){ve(n,e)||Ol(e,n)||(n.state.pasteIncoming=+new Date,r.fastPoll())}),fe(i,"cut",o),fe(i,"copy",o),fe(e.scroller,"paste",function(t){if(!xr(e,t)&&!ve(n,t)){if(!i.dispatchEvent)return n.state.pasteIncoming=+new Date,void r.focus();var o=new Event("paste");o.clipboardData=t.clipboardData,i.dispatchEvent(o)}}),fe(e.lineSpace,"selectstart",function(t){xr(e,t)||we(t)}),fe(i,"compositionstart",function(){var e=n.getCursor("from");r.composing&&r.composing.range.clear(),r.composing={start:e,range:n.markText(e,n.getCursor("to"),{className:"CodeMirror-composing"})}}),fe(i,"compositionend",function(){r.composing&&(r.poll(),r.composing.range.clear(),r.composing=null)})},Gl.prototype.createField=function(e){this.wrapper=Hl(),this.textarea=this.wrapper.firstChild},Gl.prototype.prepareSelection=function(){var e=this.cm,t=e.display,r=e.doc,n=gn(e);if(e.options.moveInputWithCursor){var i=Xr(e,r.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),l=t.lineDiv.getBoundingClientRect();n.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+l.top-o.top)),n.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+l.left-o.left))}return n},Gl.prototype.showSelection=function(e){var t=this.cm.display;N(t.cursorDiv,e.cursors),N(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},Gl.prototype.reset=function(e){if(!this.contextMenuPending&&!this.composing){var t=this.cm;if(t.somethingSelected()){this.prevInput="";var r=t.getSelection();this.textarea.value=r,t.state.focused&&P(this.textarea),l&&s>=9&&(this.hasSelection=r)}else e||(this.prevInput=this.textarea.value="",l&&s>=9&&(this.hasSelection=null))}},Gl.prototype.getField=function(){return this.textarea},Gl.prototype.supportsTouch=function(){return!1},Gl.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!m||W()!=this.textarea))try{this.textarea.focus()}catch(e){}},Gl.prototype.blur=function(){this.textarea.blur()},Gl.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Gl.prototype.receivedFocus=function(){this.slowPoll()},Gl.prototype.slowPoll=function(){var e=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,function(){e.poll(),e.cm.state.focused&&e.slowPoll()})},Gl.prototype.fastPoll=function(){var e=!1,t=this;t.pollingFast=!0,t.polling.set(20,function r(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,r))})},Gl.prototype.poll=function(){var e=this,t=this.cm,r=this.textarea,n=this.prevInput;if(this.contextMenuPending||!t.state.focused||He(r)&&!n&&!this.composing||t.isReadOnly()||t.options.disableInput||t.state.keySeq)return!1;var i=r.value;if(i==n&&!t.somethingSelected())return!1;if(l&&s>=9&&this.hasSelection===i||y&&/[\uf700-\uf7ff]/.test(i))return t.display.input.reset(),!1;if(t.doc.sel==t.display.selForContextMenu){var o=i.charCodeAt(0);if(8203!=o||n||(n="​"),8666==o)return this.reset(),this.cm.execCommand("undo")}for(var a=0,u=Math.min(n.length,i.length);a1e3||i.indexOf("\n")>-1?r.value=e.prevInput="":e.prevInput=i,e.composing&&(e.composing.range.clear(),e.composing.range=t.markText(e.composing.start,t.getCursor("to"),{className:"CodeMirror-composing"}))}),!0},Gl.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Gl.prototype.onKeyPress=function(){l&&s>=9&&(this.hasSelection=null),this.fastPoll()},Gl.prototype.onContextMenu=function(e){var t=this,r=t.cm,n=r.display,i=t.textarea;t.contextMenuPending&&t.contextMenuPending();var o=sn(r,e),u=n.scroller.scrollTop;if(o&&!h){r.options.resetSelectionOnContextMenu&&-1==r.doc.sel.contains(o)&&Zn(r,$i)(r.doc,xi(o),V);var c,f=i.style.cssText,d=t.wrapper.style.cssText,p=t.wrapper.offsetParent.getBoundingClientRect();if(t.wrapper.style.cssText="position: static",i.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(e.clientY-p.top-5)+"px; left: "+(e.clientX-p.left-5)+"px;\n      z-index: 1000; background: "+(l?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",a&&(c=window.scrollY),n.input.focus(),a&&window.scrollTo(null,c),n.input.reset(),r.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=m,n.selForContextMenu=r.doc.sel,clearTimeout(n.detectingSelectAll),l&&s>=9&&v(),S){Se(e);var g=function(){pe(window,"mouseup",g),setTimeout(m,20)};fe(window,"mouseup",g)}else setTimeout(m,50)}function v(){if(null!=i.selectionStart){var e=r.somethingSelected(),o="​"+(e?i.value:"");i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,n.selForContextMenu=r.doc.sel}}function m(){if(t.contextMenuPending==m&&(t.contextMenuPending=!1,t.wrapper.style.cssText=d,i.style.cssText=f,l&&s<9&&n.scrollbars.setScrollTop(n.scroller.scrollTop=u),null!=i.selectionStart)){(!l||l&&s<9)&&v();var e=0,o=function(){n.selForContextMenu==r.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?Zn(r,no)(r):e++<10?n.detectingSelectAll=setTimeout(o,500):(n.selForContextMenu=null,n.input.reset())};n.detectingSelectAll=setTimeout(o,200)}}},Gl.prototype.readOnlyChanged=function(e){e||this.reset(),this.textarea.disabled="nocursor"==e},Gl.prototype.setUneditable=function(){},Gl.prototype.needsContentAttribute=!1,function(e){var t=e.optionHandlers;function r(r,n,i,o){e.defaults[r]=n,i&&(t[r]=o?function(e,t,r){r!=yl&&i(e,t,r)}:i)}e.defineOption=r,e.Init=yl,r("value","",function(e,t){return e.setValue(t)},!0),r("mode",null,function(e,t){e.doc.modeOption=t,Ti(e)},!0),r("indentUnit",2,Ti,!0),r("indentWithTabs",!1),r("smartIndent",!0),r("tabSize",4,function(e){Mi(e),Rr(e),un(e)},!0),r("lineSeparator",null,function(e,t){if(e.doc.lineSep=t,t){var r=[],n=e.doc.first;e.doc.iter(function(e){for(var i=0;;){var o=e.text.indexOf(t,i);if(-1==o)break;i=o+t.length,r.push(et(n,o))}n++});for(var i=r.length-1;i>=0;i--)co(e.doc,t,r[i],et(r[i].line,r[i].ch+t.length))}}),r("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g,function(e,t,r){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),r!=yl&&e.refresh()}),r("specialCharPlaceholder",Qt,function(e){return e.refresh()},!0),r("electricChars",!0),r("inputStyle",m?"contenteditable":"textarea",function(){throw new Error("inputStyle can not (yet) be changed in a running editor")},!0),r("spellcheck",!1,function(e,t){return e.getInputField().spellcheck=t},!0),r("autocorrect",!1,function(e,t){return e.getInputField().autocorrect=t},!0),r("autocapitalize",!1,function(e,t){return e.getInputField().autocapitalize=t},!0),r("rtlMoveVisually",!w),r("wholeLineUpdateBefore",!0),r("theme","default",function(e){ml(e),fi(e)},!0),r("keyMap","default",function(e,t,r){var n=Xo(t),i=r!=yl&&Xo(r);i&&i.detach&&i.detach(e,n),n.attach&&n.attach(e,i||null)}),r("extraKeys",null),r("configureMouse",null),r("lineWrapping",!1,Cl,!0),r("gutters",[],function(e,t){e.display.gutterSpecs=ci(t,e.options.lineNumbers),fi(e)},!0),r("fixedGutter",!0,function(e,t){e.display.gutters.style.left=t?nn(e.display)+"px":"0",e.refresh()},!0),r("coverGutterNextToScrollbar",!1,function(e){return Rn(e)},!0),r("scrollbarStyle","native",function(e){Un(e),Rn(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)},!0),r("lineNumbers",!1,function(e,t){e.display.gutterSpecs=ci(e.options.gutters,t),fi(e)},!0),r("firstLineNumber",1,fi,!0),r("lineNumberFormatter",function(e){return e},fi,!0),r("showCursorWhenSelecting",!1,pn,!0),r("resetSelectionOnContextMenu",!0),r("lineWiseCopyCut",!0),r("pasteLinesPerSelection",!0),r("selectionsMayTouch",!1),r("readOnly",!1,function(e,t){"nocursor"==t&&(Sn(e),e.display.input.blur()),e.display.input.readOnlyChanged(t)}),r("disableInput",!1,function(e,t){t||e.display.input.reset()},!0),r("dragDrop",!0,xl),r("allowDropFileTypes",null),r("cursorBlinkRate",530),r("cursorScrollMargin",0),r("cursorHeight",1,pn,!0),r("singleCursorHeightPerLine",!0,pn,!0),r("workTime",100),r("workDelay",100),r("flattenSpans",!0,Mi,!0),r("addModeClass",!1,Mi,!0),r("pollInterval",100),r("undoDepth",200,function(e,t){return e.doc.history.undoDepth=t}),r("historyEventDelay",1250),r("viewportMargin",10,function(e){return e.refresh()},!0),r("maxHighlightLength",1e4,Mi,!0),r("moveInputWithCursor",!0,function(e,t){t||e.display.input.resetPosition()}),r("tabindex",null,function(e,t){return e.display.input.getField().tabIndex=t||""}),r("autofocus",null),r("direction","ltr",function(e,t){return e.doc.setDirection(t)},!0),r("phrases",null)}(Sl),function(e){var t=e.optionHandlers,r=e.helpers={};e.prototype={constructor:e,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,r){var n=this.options,i=n[e];n[e]==r&&"mode"!=e||(n[e]=r,t.hasOwnProperty(e)&&Zn(this,t[e])(this,r,i),ge(this,"optionChange",this,e))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](Xo(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,r=0;rr&&(kl(this,i.head.line,e,!0),r=i.head.line,n==this.doc.sel.primIndex&&On(this));else{var o=i.from(),l=i.to(),s=Math.max(r,o.line);r=Math.min(this.lastLine(),l.line-(l.ch?0:1))+1;for(var a=s;a0&&Xi(this.doc,n,new bi(o,u[n].to()),V)}}}),getTokenAt:function(e,t){return yt(this,e,t)},getLineTokens:function(e,t){return yt(this,et(e),t,!0)},getTokenTypeAt:function(e){e=st(this.doc,e);var t,r=ft(this,Xe(this.doc,e.line)),n=0,i=(r.length-1)/2,o=e.ch;if(0==o)t=r[2];else for(;;){var l=n+i>>1;if((l?r[2*l-1]:0)>=o)i=l;else{if(!(r[2*l+1]o&&(e=o,i=!0),n=Xe(this.doc,e)}else n=e;return Vr(this,n,{top:0,left:0},t||"page",r||i).top+(i?this.doc.height-Vt(n):0)},defaultTextHeight:function(){return en(this.display)},defaultCharWidth:function(){return tn(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,r,n,i){var o,l,s,a=this.display,u=(e=Xr(this,st(this.doc,e))).bottom,c=e.left;if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),a.sizer.appendChild(t),"over"==n)u=e.top;else if("above"==n||"near"==n){var h=Math.max(a.wrapper.clientHeight,this.doc.height),f=Math.max(a.sizer.clientWidth,a.lineSpace.clientWidth);("above"==n||e.bottom+t.offsetHeight>h)&&e.top>t.offsetHeight?u=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=h&&(u=e.bottom),c+t.offsetWidth>f&&(c=f-t.offsetWidth)}t.style.top=u+"px",t.style.left=t.style.right="","right"==i?(c=a.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?c=0:"middle"==i&&(c=(a.sizer.clientWidth-t.offsetWidth)/2),t.style.left=c+"px"),r&&(o=this,l={left:c,top:u,right:c+t.offsetWidth,bottom:u+t.offsetHeight},null!=(s=Mn(o,l)).scrollTop&&Hn(o,s.scrollTop),null!=s.scrollLeft&&Pn(o,s.scrollLeft))},triggerOnKeyDown:Qn(ll),triggerOnKeyPress:Qn(al),triggerOnKeyUp:sl,triggerOnMouseDown:Qn(fl),execCommand:function(e){if(Zo.hasOwnProperty(e))return Zo[e].call(null,this)},triggerElectric:Qn(function(e){Al(this,e)}),findPosH:function(e,t,r,n){var i=1;t<0&&(i=-1,t=-t);for(var o=st(this.doc,e),l=0;l0&&l(t.charAt(r-1));)--r;for(;n.5)&&ln(this),ge(this,"refresh",this)}),swapDoc:Qn(function(e){var t=this.doc;return t.cm=null,this.state.selectingText&&this.state.selectingText(),Di(this,e),Rr(this),this.display.input.reset(),An(this,e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,sr(this,"swapDoc",this,t),t}),phrase:function(e){var t=this.options.phrases;return t&&Object.prototype.hasOwnProperty.call(t,e)?t[e]:e},getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},be(e),e.registerHelper=function(t,n,i){r.hasOwnProperty(t)||(r[t]=e[t]={_global:[]}),r[t][n]=i},e.registerGlobalHelper=function(t,n,i,o){e.registerHelper(t,n,o),r[t]._global.push({pred:i,val:o})}}(Sl);var Ul="iter insert remove copy getEditor constructor".split(" ");for(var Vl in Mo.prototype)Mo.prototype.hasOwnProperty(Vl)&&B(Ul,Vl)<0&&(Sl.prototype[Vl]=function(e){return function(){return e.apply(this.doc,arguments)}}(Mo.prototype[Vl]));return be(Mo),Sl.inputStyles={textarea:Gl,contenteditable:El},Sl.defineMode=function(e){Sl.defaults.mode||"null"==e||(Sl.defaults.mode=e),function(e,t){arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),Ee[e]=t}.apply(this,arguments)},Sl.defineMIME=function(e,t){Ie[e]=t},Sl.defineMode("null",function(){return{token:function(e){return e.skipToEnd()}}}),Sl.defineMIME("text/plain","null"),Sl.defineExtension=function(e,t){Sl.prototype[e]=t},Sl.defineDocExtension=function(e,t){Mo.prototype[e]=t},Sl.fromTextArea=function(e,t){if((t=t?I(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var r=W();t.autofocus=r==e||null!=e.getAttribute("autofocus")&&r==document.body}function n(){e.value=s.getValue()}var i;if(e.form&&(fe(e.form,"submit",n),!t.leaveSubmitMethodAlone)){var o=e.form;i=o.submit;try{var l=o.submit=function(){n(),o.submit=i,o.submit(),o.submit=l}}catch(e){}}t.finishInit=function(r){r.save=n,r.getTextArea=function(){return e},r.toTextArea=function(){r.toTextArea=isNaN,n(),e.parentNode.removeChild(r.getWrapperElement()),e.style.display="",e.form&&(pe(e.form,"submit",n),t.leaveSubmitMethodAlone||"function"!=typeof e.form.submit||(e.form.submit=i))}},e.style.display="none";var s=Sl(function(t){return e.parentNode.insertBefore(t,e.nextSibling)},t);return s},function(e){e.off=pe,e.on=fe,e.wheelEventPixels=vi,e.Doc=Mo,e.splitLines=We,e.countColumn=z,e.findColumn=X,e.isWordChar=ee,e.Pass=U,e.signal=ge,e.Line=Xt,e.changeEnd=Ci,e.scrollbarModel=Gn,e.Pos=et,e.cmpPos=tt,e.modes=Ee,e.mimeModes=Ie,e.resolveMode=ze,e.getMode=Re,e.modeExtensions=Be,e.extendMode=Ge,e.copyState=Ue,e.startState=Ke,e.innerMode=Ve,e.commands=Zo,e.keyMap=Ro,e.keyName=jo,e.isModifierKey=Vo,e.lookupKey=Uo,e.normalizeKeyMap=Go,e.StringStream=je,e.SharedTextMarker=So,e.TextMarker=xo,e.LineWidget=yo,e.e_preventDefault=we,e.e_stopPropagation=xe,e.e_stop=Se,e.addClass=H,e.contains=D,e.rmClass=T,e.keyNames=Po}(Sl),Sl.version="5.49.2",Sl});
\ No newline at end of file
diff --git a/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js b/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
new file mode 100644
index 00000000..4a5e499b
--- /dev/null
+++ b/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
@@ -0,0 +1 @@
+!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("yaml",function(){var e=new RegExp("\\b(("+["true","false","on","off","yes","no"].join(")|(")+"))$","i");return{token:function(i,t){var r=i.peek(),n=t.escaped;if(t.escaped=!1,"#"==r&&(0==i.pos||/\s/.test(i.string.charAt(i.pos-1))))return i.skipToEnd(),"comment";if(i.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))return"string";if(t.literal&&i.indentation()>t.keyCol)return i.skipToEnd(),"string";if(t.literal&&(t.literal=!1),i.sol()){if(t.keyCol=0,t.pair=!1,t.pairStart=!1,i.match(/---/))return"def";if(i.match(/\.\.\./))return"def";if(i.match(/\s*-\s+/))return"meta"}if(i.match(/^(\{|\}|\[|\])/))return"{"==r?t.inlinePairs++:"}"==r?t.inlinePairs--:"["==r?t.inlineList++:t.inlineList--,"meta";if(t.inlineList>0&&!n&&","==r)return i.next(),"meta";if(t.inlinePairs>0&&!n&&","==r)return t.keyCol=0,t.pair=!1,t.pairStart=!1,i.next(),"meta";if(t.pairStart){if(i.match(/^\s*(\||\>)\s*/))return t.literal=!0,"meta";if(i.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i))return"variable-2";if(0==t.inlinePairs&&i.match(/^\s*-?[0-9\.\,]+\s?$/))return"number";if(t.inlinePairs>0&&i.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/))return"number";if(i.match(e))return"keyword"}return!t.pair&&i.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)?(t.pair=!0,t.keyCol=i.indentation(),"atom"):t.pair&&i.match(/^:\s*/)?(t.pairStart=!0,"meta"):(t.pairStart=!1,t.escaped="\\"==r,i.next(),null)},startState:function(){return{pair:!1,pairStart:!1,keyCol:0,inlinePairs:0,inlineList:0,literal:!1,escaped:!1}},lineComment:"#",fold:"indent"}}),e.defineMIME("text/x-yaml","yaml"),e.defineMIME("text/yaml","yaml")});
\ No newline at end of file
diff --git a/root/www/luci-static/resources/codemirror/theme/dracula.css b/root/www/luci-static/resources/codemirror/theme/dracula.css
new file mode 100644
index 00000000..6c708c01
--- /dev/null
+++ b/root/www/luci-static/resources/codemirror/theme/dracula.css
@@ -0,0 +1 @@
+.cm-s-dracula.CodeMirror,.cm-s-dracula .CodeMirror-gutters{background-color:#282a36 !important;color:#f8f8f2 !important;border:0}.cm-s-dracula .CodeMirror-gutters{color:#282a36}.cm-s-dracula .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-dracula .CodeMirror-linenumber{color:#6d8a88}.cm-s-dracula .CodeMirror-selected{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::selection,.cm-s-dracula .CodeMirror-line>span::selection,.cm-s-dracula .CodeMirror-line>span>span::selection{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::-moz-selection,.cm-s-dracula .CodeMirror-line>span::-moz-selection,.cm-s-dracula .CodeMirror-line>span>span::-moz-selection{background:rgba(255,255,255,0.10)}.cm-s-dracula span.cm-comment{color:#6272a4}.cm-s-dracula span.cm-string,.cm-s-dracula span.cm-string-2{color:#f1fa8c}.cm-s-dracula span.cm-number{color:#bd93f9}.cm-s-dracula span.cm-variable{color:#50fa7b}.cm-s-dracula span.cm-variable-2{color:white}.cm-s-dracula span.cm-def{color:#50fa7b}.cm-s-dracula span.cm-operator{color:#ff79c6}.cm-s-dracula span.cm-keyword{color:#ff79c6}.cm-s-dracula span.cm-atom{color:#bd93f9}.cm-s-dracula span.cm-meta{color:#f8f8f2}.cm-s-dracula span.cm-tag{color:#ff79c6}.cm-s-dracula span.cm-attribute{color:#50fa7b}.cm-s-dracula span.cm-qualifier{color:#50fa7b}.cm-s-dracula span.cm-property{color:#66d9ef}.cm-s-dracula span.cm-builtin{color:#50fa7b}.cm-s-dracula span.cm-variable-3,.cm-s-dracula span.cm-type{color:#ffb86c}.cm-s-dracula .CodeMirror-activeline-background{background:rgba(255,255,255,0.1)}.cm-s-dracula .CodeMirror-matchingbracket{text-decoration:underline;color:white !important}
diff --git a/root/www/luci-static/resources/twin-bcrypt.min.js b/root/www/luci-static/resources/twin-bcrypt.min.js
new file mode 100644
index 00000000..6284357c
--- /dev/null
+++ b/root/www/luci-static/resources/twin-bcrypt.min.js
@@ -0,0 +1,7 @@
+/* @license
+ * Twin-Bcrypt 2.2.0
+ * https://github.com/fpirsch/twin-bcrypt
+ * Licence: BSD-3-Clause
+ */
+!function(r,n){"use strict";function e(r){return y[g]=t.apply(n,r),g++}function t(r){var e=[].slice.call(arguments,1);return function(){"function"==typeof r?r.apply(n,e):new Function(""+r)()}}function o(r){if(m)setTimeout(t(o,r),0);else{var n=y[r];if(n){m=!0;try{n()}finally{a(r),m=!1}}}}function a(r){delete y[r]}function i(){p=function(){var r=e(arguments);return process.nextTick(t(o,r)),r}}function u(){if(r.postMessage&&!r.importScripts){var n=!0,e=r.onmessage;return r.onmessage=function(){n=!1},r.postMessage("","*"),r.onmessage=e,n}}function f(){var n="setImmediate$"+Math.random()+"$",t=function(e){e.source===r&&"string"==typeof e.data&&0===e.data.indexOf(n)&&o(+e.data.slice(n.length))};r.addEventListener?r.addEventListener("message",t,!1):r.attachEvent("onmessage",t),p=function(){var t=e(arguments);return r.postMessage(n+t,"*"),t}}function c(){var r=new MessageChannel;r.port1.onmessage=function(r){var n=r.data;o(n)},p=function(){var n=e(arguments);return r.port2.postMessage(n),n}}function s(){var r=v.documentElement;p=function(){var n=e(arguments),t=v.createElement("script");return t.onreadystatechange=function(){o(n),t.onreadystatechange=null,r.removeChild(t),t=null},r.appendChild(t),n}}function l(){p=function(){var r=e(arguments);return setTimeout(t(o,r),0),r}}if(!r.setImmediate){var p,g=1,y={},m=!1,v=r.document,d=Object.getPrototypeOf&&Object.getPrototypeOf(r);d=d&&d.setTimeout?d:r,"[object process]"==={}.toString.call(r.process)?i():u()?f():r.MessageChannel?c():v&&"onreadystatechange"in v.createElement("script")?s():l(),d.setImmediate=p,d.clearImmediate=a}}(new Function("return this")()),function(r){"object"==typeof exports?r(exports,require("crypto")):r(self.TwinBcrypt={},self.crypto||self.msCrypto)}(function(r,n){"use strict";function e(r){for(var n=unescape(encodeURIComponent(r)),e=n.length,t=new Array(e),o=0;e>o;o++)t[o]=n.charCodeAt(o);return t}function t(r){for(var n=r.length,e=new Array(n),t=0;n>t;t++)e[t]=r.charCodeAt(t);return e}function o(r,n){for(var e,t,o=0,a="";n>o;){if(e=255&r[o++],a+=B[e>>2],e=(3&e)<<4,o>=n){a+=B[e];break}if(t=255&r[o++],e|=t>>4,a+=B[e],e=(15&t)<<2,o>=n){a+=B[e];break}t=255&r[o++],e|=t>>6,a+=B[e],a+=B[63&t]}return a}function a(r){for(var n,e,t=new Array(16),o=0,a=0;;){if(n=D[r.charCodeAt(o++)-46],e=D[r.charCodeAt(o++)-46],t[a++]=255&(n<<2|e>>4),22===o)break;n=e<<4,e=D[r.charCodeAt(o++)-46],t[a++]=255&(n|e>>2),n=e<<6,e=D[r.charCodeAt(o++)-46],t[a++]=255&(n|e)}return t}function i(r){for(var n=r.length,e=new Array(72),t=0,o=0;72>o;)e[o++]=r[t++],t===n&&(t=0);return e}function u(r,n,e){for(var t=0,o=e>>2;tt;)r[n++]=e[t++]<<24|e[t++]<<16|e[t++]<<8|e[t++]}function c(r){function n(n){for(var e=r,t=G>>2,o=t|O,f=n>>2,c=e[f]^e[t],s=e[1|f];o>t;)s^=(e[c>>>24]+e[a|c>>>16&255]^e[i|c>>>8&255])+e[u|255&c]^e[++t],c^=(e[s>>>24]+e[a|s>>>16&255]^e[i|s>>>8&255])+e[u|255&s]^e[++t];e[f]=s^e[S>>2],e[1|f]=c}function e(n){var e;for(r[L>>2]=0,r[L+4>>2]=0,e=0;M>e;e++)r[G>>2|e]^=r[(n>>2)+e];var t,o,f,c,s,l=r;for(e=0;M>e;e+=2){for(t=G>>2,o=t|O,f=L>>2,c=l[f]^l[t],s=l[1|f];o>t;)s^=(l[c>>>24]+l[a|c>>>16&255]^l[i|c>>>8&255])+l[u|255&c]^l[++t],c^=(l[s>>>24]+l[a|s>>>16&255]^l[i|s>>>8&255])+l[u|255&s]^l[++t];l[f]=s^l[S>>2],l[1|f]=c,r[G>>2|e]=l[f],r[G>>2|e+1]=c}for(e=0;T>e;e+=2){for(t=G>>2,o=t|O,f=L>>2,c=l[f]^l[t],s=l[1|f];o>t;)s^=(l[c>>>24]+l[a|c>>>16&255]^l[i|c>>>8&255])+l[u|255&c]^l[++t],c^=(l[s>>>24]+l[a|s>>>16&255]^l[i|s>>>8&255])+l[u|255&s]^l[++t];l[f]=s^l[S>>2],l[1|f]=c,r[e]=l[f],r[1|e]=c}}function t(r,n,t){for(var o=0;t>=o&&!(r>n);o++)e(R),e(j),r++;return r}var o=k>>2,a=o+256|0,i=a+256|0,u=i+256|0;return{encrypt:n,expandLoop:t}}function s(stdlib, foreign, heap) {"use asm";var HEAP32=new stdlib.Uint32Array(heap);var BLOWFISH_NUM_ROUNDS=16;var S_offset=0x0000;var S1_offset=0x0400;var S2_offset=0x0800;var S3_offset=0x0C00;var P_offset=0x1000;var P_last_offset=0x1044;var crypt_ciphertext_offset=0x1048;var LR_offset=0x01060;var password_offset=0x1068;var salt_offset=0x10b0;var P_LEN=18;var S_LEN=1024;function encrypt(offset) {offset=offset|0;var i=0;var n=0;var L=0;var R=0;var imax=0;imax=P_offset|BLOWFISH_NUM_ROUNDS<<2;L=HEAP32[offset>>2]|0;R=HEAP32[offset+4>>2]|0;L=L^HEAP32[P_offset>>2];for (i=P_offset; (i|0)<(imax|0);) {i=(i+4)>>>0;R=R^(((HEAP32[(L>>>22)>>2]>>>0) +(HEAP32[(S1_offset|(L>>>14&0x3ff))>>2]>>>0) ^(HEAP32[(S2_offset|(L>>>6&0x3ff))>>2])) +(HEAP32[(S3_offset|(L<<2&0x3ff))>>2]>>>0))^HEAP32[i>>2];i=(i+4)>>>0;L=L^(((HEAP32[(R>>>22)>>2]>>>0) +(HEAP32[(S1_offset|(R>>>14&0x3ff))>>2]>>>0) ^(HEAP32[(S2_offset|(R>>>6&0x3ff))>>2])) +(HEAP32[(S3_offset|(R<<2&0x3ff))>>2]>>>0))^HEAP32[i>>2];}HEAP32[offset>>2]=R^HEAP32[P_last_offset>>2];HEAP32[(offset+4)>>2]=L;}function expandKey(offset) {offset=offset|0;var i=0;var off=0;off=P_offset|0;for (i=0; (i|0)<(P_LEN|0); i=(i+1)|0) {HEAP32[off>>2]=HEAP32[off>>2]^HEAP32[offset>>2];offset=(offset+4)|0;off=(off+4)|0;}HEAP32[LR_offset>>2]=0;HEAP32[LR_offset+4>>2]=0;off=P_offset;for (i=0; (i|0)<(P_LEN|0); i=(i+2)|0) {encrypt(LR_offset);HEAP32[off>>2]=HEAP32[LR_offset>>2];HEAP32[off+4>>2]=HEAP32[LR_offset+4>>2];off=(off+8)|0;}off=S_offset;for (i=0; (i|0)<(S_LEN|0); i=(i+2)|0) {encrypt(LR_offset);HEAP32[off>>2]=HEAP32[LR_offset>>2];HEAP32[off+4>>2]=HEAP32[LR_offset+4>>2];off=(off+8)|0;}}function expandLoop(i, counterEnd, maxIterations) {i=i|0;counterEnd=counterEnd|0;maxIterations=maxIterations|0;var j=0;for (j=0; (j|0) <= (maxIterations|0); j=(j+1)|0) {if ((i>>>0)>(counterEnd>>>0)) break;expandKey(password_offset);expandKey(salt_offset);i=(i+1)>>>0;}return i|0;}return {encrypt: encrypt,expandLoop: expandLoop};}
+function l(r,n,e,t){var o,a,i,u=L>>2,f=u+1;for(t[u]=0,t[f]=0,a=0,o=0;M>o;o++)i=n[a++]<<24|n[a++]<<16|n[a++]<<8|n[a++],t[G>>2|o]^=i;for(a=0,o=0;M>o;o+=2)i=r[a++]<<24|r[a++]<<16|r[a++]<<8|r[a++],a&=65295,t[u]^=i,i=r[a++]<<24|r[a++]<<16|r[a++]<<8|r[a++],a&=65295,t[f]^=i,e.encrypt(L),t[G>>2|o]=t[u],t[G>>2|o+1]=t[f];var c=k>>2;for(o=0;T>o;o+=2)i=r[a++]<<24|r[a++]<<16|r[a++]<<8|r[a++],a&=65295,t[u]^=i,i=r[a++]<<24|r[a++]<<16|r[a++]<<8|r[a++],a&=65295,t[f]^=i,e.encrypt(L),t[c|o]=t[u],t[c|o+1]=t[f]}function p(r,n,e,t,o,a,i){for(var u=e;t>=u;){if(u=r.expandLoop(u,t,o),a){var f=a(u/(t+1));if(f===!1)return}if(u>t){if(i)return void setImmediate(g.bind(null,r,n,i));return}if(i)return void setImmediate(p.bind(null,r,n,u,t,o,a,i))}}function g(r,n,e){u(n,x,F);var t;for(t=0;64>t;t++)r.encrypt(F+0),r.encrypt(F+8),r.encrypt(F+16);var o,a=0,i=x.length,f=new Array(4*i);for(t=0;i>t;t++)o=n[(F>>2)+t],f[a++]=o>>24,f[a++]=o>>16&255,f[a++]=o>>8&255,f[a++]=255&o;return e&&e(f),f}function y(r,n){return r+o(n,23)}function m(n,o,m,v){var d,h=o.substr(0,29),w=+o.substr(4,2),A=o.substr(7,22);if("string"==typeof n)d=r.encodingMode===r.ENCODING_UTF8?e(n):t(n);else if(Array.isArray(n))d=n.map(function(r){return 255&r});else{if(!(n instanceof Uint8Array))throw new Error("Incorrect arguments");d=Array.prototype.slice.call(n)}d.push(0);var b,E,N=a(A,C),O=31>w?1<>2,N),f(b,R>>2,d),l(N,d,E,b),v?void p(E,b,0,M,T,m,function(r){v(y(h,r))}):(p(E,b,0,M,T,m),y(h,g(E,b)))}function v(r){if(!b)throw new Error("No cryptographically secure pseudorandom number generator available.");if(null==r&&(r=N),r=0|+r,isNaN(r)||4>r||r>31)throw new Error("Invalid cost parameter.");var n="$2y$";return 10>r&&(n+="0"),n+=r+"$",n+=o(b(C),C)}function d(r,n,e){if(n&&"number"!=typeof n){if("string"!=typeof n||!z.test(n))throw new Error("Invalid salt")}else n=v(n);return m(r,n,e)}function h(r,n,e,t){if(arguments.length<2)throw new Error("Incorrect arguments");if(2===arguments.length?(t=n,n=e=null):3===arguments.length&&(t=e,e=null,"function"==typeof n&&(e=n,n=null)),n&&"number"!=typeof n){if("string"!=typeof n||!z.test(n))throw new Error("Invalid salt")}else n=v(n);if(!t||"function"!=typeof t)throw new Error("No callback function was given.");m(r,n,e,t)}function w(r,n){if("string"!=typeof n||!Z.test(n))throw new Error("Incorrect arguments");var e=n.substr(0,n.length-31),t=d(r,e);return t===n}function A(r,n,e,t){if("string"!=typeof n||!Z.test(n))throw new Error("Incorrect arguments");if(t||(t=e,e=null),!t||"function"!=typeof t)throw new Error("No callback function was given.");var o=n.substr(0,n.length-31);h(r,o,e,function(r){t(r===n)})}var b,E="undefined"!=typeof InstallTrigger,I=E;n&&(b=n.randomBytes,n.getRandomValues&&(b=function(r){var e=new Uint8Array(r);return n.getRandomValues(e)}));var C=16,N=10,O=16,$=[608135816,2242054355,320440878,57701188,2752067618,698298832,137296536,3964562569,1160258022,953160567,3193202383,887688300,3232508343,3380367581,1065670069,3041331479,2450970073,2306472731],U=[3509652390,2564797868,805139163,3491422135,3101798381,1780907670,3128725573,4046225305,614570311,3012652279,134345442,2240740374,1667834072,1901547113,2757295779,4103290238,227898511,1921955416,1904987480,2182433518,2069144605,3260701109,2620446009,720527379,3318853667,677414384,3393288472,3101374703,2390351024,1614419982,1822297739,2954791486,3608508353,3174124327,2024746970,1432378464,3864339955,2857741204,1464375394,1676153920,1439316330,715854006,3033291828,289532110,2706671279,2087905683,3018724369,1668267050,732546397,1947742710,3462151702,2609353502,2950085171,1814351708,2050118529,680887927,999245976,1800124847,3300911131,1713906067,1641548236,4213287313,1216130144,1575780402,4018429277,3917837745,3693486850,3949271944,596196993,3549867205,258830323,2213823033,772490370,2760122372,1774776394,2652871518,566650946,4142492826,1728879713,2882767088,1783734482,3629395816,2517608232,2874225571,1861159788,326777828,3124490320,2130389656,2716951837,967770486,1724537150,2185432712,2364442137,1164943284,2105845187,998989502,3765401048,2244026483,1075463327,1455516326,1322494562,910128902,469688178,1117454909,936433444,3490320968,3675253459,1240580251,122909385,2157517691,634681816,4142456567,3825094682,3061402683,2540495037,79693498,3249098678,1084186820,1583128258,426386531,1761308591,1047286709,322548459,995290223,1845252383,2603652396,3431023940,2942221577,3202600964,3727903485,1712269319,422464435,3234572375,1170764815,3523960633,3117677531,1434042557,442511882,3600875718,1076654713,1738483198,4213154764,2393238008,3677496056,1014306527,4251020053,793779912,2902807211,842905082,4246964064,1395751752,1040244610,2656851899,3396308128,445077038,3742853595,3577915638,679411651,2892444358,2354009459,1767581616,3150600392,3791627101,3102740896,284835224,4246832056,1258075500,768725851,2589189241,3069724005,3532540348,1274779536,3789419226,2764799539,1660621633,3471099624,4011903706,913787905,3497959166,737222580,2514213453,2928710040,3937242737,1804850592,3499020752,2949064160,2386320175,2390070455,2415321851,4061277028,2290661394,2416832540,1336762016,1754252060,3520065937,3014181293,791618072,3188594551,3933548030,2332172193,3852520463,3043980520,413987798,3465142937,3030929376,4245938359,2093235073,3534596313,375366246,2157278981,2479649556,555357303,3870105701,2008414854,3344188149,4221384143,3956125452,2067696032,3594591187,2921233993,2428461,544322398,577241275,1471733935,610547355,4027169054,1432588573,1507829418,2025931657,3646575487,545086370,48609733,2200306550,1653985193,298326376,1316178497,3007786442,2064951626,458293330,2589141269,3591329599,3164325604,727753846,2179363840,146436021,1461446943,4069977195,705550613,3059967265,3887724982,4281599278,3313849956,1404054877,2845806497,146425753,1854211946,1266315497,3048417604,3681880366,3289982499,290971e4,1235738493,2632868024,2414719590,3970600049,1771706367,1449415276,3266420449,422970021,1963543593,2690192192,3826793022,1062508698,1531092325,1804592342,2583117782,2714934279,4024971509,1294809318,4028980673,1289560198,2221992742,1669523910,35572830,157838143,1052438473,1016535060,1802137761,1753167236,1386275462,3080475397,2857371447,1040679964,2145300060,2390574316,1461121720,2956646967,4031777805,4028374788,33600511,2920084762,1018524850,629373528,3691585981,3515945977,2091462646,2486323059,586499841,988145025,935516892,3367335476,2599673255,2839830854,265290510,3972581182,2759138881,3795373465,1005194799,847297441,406762289,1314163512,1332590856,1866599683,4127851711,750260880,613907577,1450815602,3165620655,3734664991,3650291728,3012275730,3704569646,1427272223,778793252,1343938022,2676280711,2052605720,1946737175,3164576444,3914038668,3967478842,3682934266,1661551462,3294938066,4011595847,840292616,3712170807,616741398,312560963,711312465,1351876610,322626781,1910503582,271666773,2175563734,1594956187,70604529,3617834859,1007753275,1495573769,4069517037,2549218298,2663038764,504708206,2263041392,3941167025,2249088522,1514023603,1998579484,1312622330,694541497,2582060303,2151582166,1382467621,776784248,2618340202,3323268794,2497899128,2784771155,503983604,4076293799,907881277,423175695,432175456,1378068232,4145222326,3954048622,3938656102,3820766613,2793130115,2977904593,26017576,3274890735,3194772133,1700274565,1756076034,4006520079,3677328699,720338349,1533947780,354530856,688349552,3973924725,1637815568,332179504,3949051286,53804574,2852348879,3044236432,1282449977,3583942155,3416972820,4006381244,1617046695,2628476075,3002303598,1686838959,431878346,2686675385,1700445008,1080580658,1009431731,832498133,3223435511,2605976345,2271191193,2516031870,1648197032,4164389018,2548247927,300782431,375919233,238389289,3353747414,2531188641,2019080857,1475708069,455242339,2609103871,448939670,3451063019,1395535956,2413381860,1841049896,1491858159,885456874,4264095073,4001119347,1565136089,3898914787,1108368660,540939232,1173283510,2745871338,3681308437,4207628240,3343053890,4016749493,1699691293,1103962373,3625875870,2256883143,3830138730,1031889488,3479347698,1535977030,4236805024,3251091107,2132092099,1774941330,1199868427,1452454533,157007616,2904115357,342012276,595725824,1480756522,206960106,497939518,591360097,863170706,2375253569,3596610801,1814182875,2094937945,3421402208,1082520231,3463918190,2785509508,435703966,3908032597,1641649973,2842273706,3305899714,1510255612,2148256476,2655287854,3276092548,4258621189,236887753,3681803219,274041037,1734335097,3815195456,3317970021,1899903192,1026095262,4050517792,356393447,2410691914,3873677099,3682840055,3913112168,2491498743,4132185628,2489919796,1091903735,1979897079,3170134830,3567386728,3557303409,857797738,1136121015,1342202287,507115054,2535736646,337727348,3213592640,1301675037,2528481711,1895095763,1721773893,3216771564,62756741,2142006736,835421444,2531993523,1442658625,3659876326,2882144922,676362277,1392781812,170690266,3921047035,1759253602,3611846912,1745797284,664899054,1329594018,3901205900,3045908486,2062866102,2865634940,3543621612,3464012697,1080764994,553557557,3656615353,3996768171,991055499,499776247,1265440854,648242737,3940784050,980351604,3713745714,1749149687,3396870395,4211799374,3640570775,1161844396,3125318951,1431517754,545492359,4268468663,3499529547,1437099964,2702547544,3433638243,2581715763,2787789398,1060185593,1593081372,2418618748,4260947970,69676912,2159744348,86519011,2512459080,3838209314,1220612927,3339683548,133810670,1090789135,1078426020,1569222167,845107691,3583754449,4072456591,1091646820,628848692,1613405280,3757631651,526609435,236106946,48312990,2942717905,3402727701,1797494240,859738849,992217954,4005476642,2243076622,3870952857,3732016268,765654824,3490871365,2511836413,1685915746,3888969200,1414112111,2273134842,3281911079,4080962846,172450625,2569994100,980381355,4109958455,2819808352,2716589560,2568741196,3681446669,3329971472,1835478071,660984891,3704678404,4045999559,3422617507,3040415634,1762651403,1719377915,3470491036,2693910283,3642056355,3138596744,1364962596,2073328063,1983633131,926494387,3423689081,2150032023,4096667949,1749200295,3328846651,309677260,2016342300,1779581495,3079819751,111262694,1274766160,443224088,298511866,1025883608,3806446537,1145181785,168956806,3641502830,3584813610,1689216846,3666258015,3200248200,1692713982,2646376535,4042768518,1618508792,1610833997,3523052358,4130873264,2001055236,3610705100,2202168115,4028541809,2961195399,1006657119,2006996926,3186142756,1430667929,3210227297,1314452623,4074634658,4101304120,2273951170,1399257539,3367210612,3027628629,1190975929,2062231137,2333990788,2221543033,2438960610,1181637006,548689776,2362791313,3372408396,3104550113,3145860560,296247880,1970579870,3078560182,3769228297,1714227617,3291629107,3898220290,166772364,1251581989,493813264,448347421,195405023,2709975567,677966185,3703036547,1463355134,2715995803,1338867538,1343315457,2802222074,2684532164,233230375,2599980071,2000651841,3277868038,1638401717,4028070440,3237316320,6314154,819756386,300326615,590932579,1405279636,3267499572,3150704214,2428286686,3959192993,3461946742,1862657033,1266418056,963775037,2089974820,2263052895,1917689273,448879540,3550394620,3981727096,150775221,3627908307,1303187396,508620638,2975983352,2726630617,1817252668,1876281319,1457606340,908771278,3720792119,3617206836,2455994898,1729034894,1080033504,976866871,3556439503,2881648439,1522871579,1555064734,1336096578,3548522304,2579274686,3574697629,3205460757,3593280638,3338716283,3079412587,564236357,2993598910,1781952180,1464380207,3163844217,3332601554,1699332808,1393555694,1183702653,3581086237,1288719814,691649499,2847557200,2895455976,3193889540,2717570544,1781354906,1676643554,2592534050,3230253752,1126444790,2770207658,2633158820,2210423226,2615765581,2414155088,3127139286,673620729,2805611233,1269405062,4015350505,3341807571,4149409754,1057255273,2012875353,2162469141,2276492801,2601117357,993977747,3918593370,2654263191,753973209,36408145,2530585658,25011837,3520020182,2088578344,530523599,2918365339,1524020338,1518925132,3760827505,3759777254,1202760957,3985898139,3906192525,674977740,4174734889,2031300136,2019492241,3983892565,4153806404,3822280332,352677332,2297720250,60907813,90501309,3286998549,1016092578,2535922412,2839152426,457141659,509813237,4120667899,652014361,1966332200,2975202805,55981186,2327461051,676427537,3255491064,2882294119,3433927263,1307055953,942726286,933058658,2468411793,3933900994,4215176142,1361170020,2001714738,2830558078,3274259782,1222529897,1679025792,2729314320,3714953764,1770335741,151462246,3013232138,1682292957,1483529935,471910574,1539241949,458788160,3436315007,1807016891,3718408830,978976581,1043663428,3165965781,1927990952,4200891579,2372276910,3208408903,3533431907,1412390302,2931980059,4132332400,1947078029,3881505623,4168226417,2941484381,1077988104,1320477388,886195818,18198404,3786409e3,2509781533,112762804,3463356488,1866414978,891333506,18488651,661792760,1628790961,3885187036,3141171499,876946877,2693282273,1372485963,791857591,2686433993,3759982718,3167212022,3472953795,2716379847,445679433,3561995674,3504004811,3574258232,54117162,3331405415,2381918588,3769707343,4154350007,1140177722,4074052095,668550556,3214352940,367459370,261225585,2610173221,4209349473,3468074219,3265815641,314222801,3066103646,3808782860,282218597,3406013506,3773591054,379116347,1285071038,846784868,2669647154,3771962079,3550491691,2305946142,453669953,1268987020,3317592352,3279303384,3744833421,2610507566,3859509063,266596637,3847019092,517658769,3462560207,3443424879,370717030,4247526661,2224018117,4143653529,4112773975,2788324899,2477274417,1456262402,2901442914,1517677493,1846949527,2295493580,3734397586,2176403920,1280348187,1908823572,3871786941,846861322,1172426758,3287448474,3383383037,1655181056,3139813346,901632758,1897031941,2986607138,3066810236,3447102507,1393639104,373351379,950779232,625454576,3124240540,4148612726,2007998917,544563296,2244738638,2330496472,2058025392,1291430526,424198748,50039436,29584100,3605783033,2429876329,2791104160,1057563949,3255363231,3075367218,3463963227,1469046755,985887462],M=$.length,T=U.length,x=[1332899944,1700884034,1701343084,1684370003,1668446532,1869963892],k=0,G=4096,S=4164,F=4168,L=4192,R=4200,j=4272,B="./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",D=[0,1,54,55,56,57,58,59,60,61,62,63,-1,-1,-1,-1,-1,-1,-1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,-1,-1,-1,-1,-1,-1,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,-1,-1,-1,-1,-1],z=/^\$2[ay]\$(0[4-9]|[12][0-9]|3[01])\$[.\/A-Za-z0-9]{21}[.Oeu]/,Z=/^\$2[ay]\$(0[4-9]|[12][0-9]|3[01])\$[.\/A-Za-z0-9]{21}[.Oeu][.\/A-Za-z0-9]{30}[.CGKOSWaeimquy26]$/;r.genSalt=v,r.hashSync=d,r.hash=h,r.compareSync=w,r.compare=A,r.ENCODING_UTF8=0,r.ENCODING_RAW=1,r.encodingMode=r.ENCODING_UTF8,r.cryptoRNG=!!b,r.randomBytes=b,r.defaultCost=N,r.version="2.2.0"});
\ No newline at end of file
diff --git a/luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/base.js b/root/www/luci-static/resources/view/adguardhome/base.js
similarity index 100%
rename from luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/base.js
rename to root/www/luci-static/resources/view/adguardhome/base.js
diff --git a/luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/compact.css b/root/www/luci-static/resources/view/adguardhome/compact.css
similarity index 100%
rename from luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/compact.css
rename to root/www/luci-static/resources/view/adguardhome/compact.css
diff --git a/luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/log.js b/root/www/luci-static/resources/view/adguardhome/log.js
similarity index 100%
rename from luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/log.js
rename to root/www/luci-static/resources/view/adguardhome/log.js
diff --git a/luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/manual.js b/root/www/luci-static/resources/view/adguardhome/manual.js
similarity index 100%
rename from luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/manual.js
rename to root/www/luci-static/resources/view/adguardhome/manual.js
diff --git a/luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/status.js b/root/www/luci-static/resources/view/adguardhome/status.js
similarity index 100%
rename from luci-app-adguardhome/root/www/luci-static/resources/view/adguardhome/status.js
rename to root/www/luci-static/resources/view/adguardhome/status.js
diff --git a/luci-app-adguardhome/scripts/build-apk.sh b/scripts/build-apk.sh
similarity index 100%
rename from luci-app-adguardhome/scripts/build-apk.sh
rename to scripts/build-apk.sh
diff --git a/luci-app-adguardhome/scripts/collect-apks.sh b/scripts/collect-apks.sh
similarity index 100%
rename from luci-app-adguardhome/scripts/collect-apks.sh
rename to scripts/collect-apks.sh
diff --git a/luci-app-adguardhome/scripts/install.sh b/scripts/install.sh
similarity index 100%
rename from luci-app-adguardhome/scripts/install.sh
rename to scripts/install.sh
diff --git a/luci-app-adguardhome/scripts/prepare-sdk.sh b/scripts/prepare-sdk.sh
similarity index 100%
rename from luci-app-adguardhome/scripts/prepare-sdk.sh
rename to scripts/prepare-sdk.sh