update 2025-02-07 20:37:12

2025-04-04 03:01:27 +08:00 · 2025-02-07 20:37:12 +08:00 · 2025-02-07 20:37:12 +08:00 · 4fae4a53c7
commit 4fae4a53c7
parent aa3dc268a4
37 changed files with 699 additions and 162 deletions
--- a/luci-app-bypass/luasrc/view/bypass/status_bottom.htm
+++ b/luci-app-bypass/luasrc/view/bypass/status_bottom.htm
@ -76,7 +76,7 @@ let wW = window.innerWidth;

 function resize() {
    wW = window.innerWidth;
-    let lw = document.querySelector(".main-left").offsetWidth;
+    let lw = document.querySelector(".main-left")?.offsetWidth ?? 5;
    let statusBar = document.querySelector(".status-bar");
    statusBar.style.width = (wW - lw) + 'px';
    let flagElement = statusBar.querySelector(".flag");
--- a/luci-app-dnsmasq-ipset/Makefile
+++ b/luci-app-dnsmasq-ipset/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-dnsmasq-ipset
-PKG_VERSION:=0.2.0
+PKG_VERSION:=0.2.1
 PKG_RELEASE:=1

 PKG_LICENSE:=GPLv3
--- a/luci-app-dnsmasq-ipset/files/root/etc/init.d/dnsmasq-ipset
+++ b/luci-app-dnsmasq-ipset/files/root/etc/init.d/dnsmasq-ipset
@ -41,10 +41,16 @@ gen_config_file() {
    else
        config_list_foreach "${section}" "managed_domain" handle_domain_ipt
    fi
+    link_config() {
+        local cfg="${1}"
+        [ -d "/tmp/dnsmasq.${cfg}.d" ] && cp -f "${config_file_name}" "/tmp/dnsmasq.${cfg}.d/ipset-${ipset_name}.conf"
+    }
+    config_load dhcp
+    config_foreach link_config dnsmasq
 }

 gen_config_files() {
-    rm -rf /tmp/dnsmasq.d/ipset-*.conf
+    rm -f /tmp/dnsmasq*.d/ipset-*.conf
    config_load dnsmasq-ipset
    config_foreach gen_config_file ipsets
 }
--- a/luci-app-immich/.vscode/settings.json
+++ b/luci-app-immich/.vscode/settings.json
@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": true
+}
--- a/luci-app-immich/Makefile
+++ b/luci-app-immich/Makefile
@ -0,0 +1,24 @@
+
+
+include $(TOPDIR)/rules.mk
+
+PKG_VERSION:=1.0.0-20250207
+PKG_RELEASE:=
+
+LUCI_TITLE:=LuCI support for Immich
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd +luci-lib-docker +docker-compose
+
+define Package/luci-app-immich/conffiles
+/etc/config/immich
+endef
+
+define Package/luci-app-immich/prerm
+#!/bin/sh
+/usr/libexec/istorec/immich.sh stop
+exit 0
+endef
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
--- a/luci-app-immich/luasrc/controller/immich.lua
+++ b/luci-app-immich/luasrc/controller/immich.lua
@ -0,0 +1,7 @@
+
+module("luci.controller.immich", package.seeall)
+
+function index()
+  entry({"admin", "services", "immich"}, alias("admin", "services", "immich", "config"), _("Immich"), 30).dependent = true
+  entry({"admin", "services", "immich", "config"}, cbi("immich"))
+end
--- a/luci-app-immich/luasrc/model/cbi/immich.lua
+++ b/luci-app-immich/luasrc/model/cbi/immich.lua
@ -0,0 +1,63 @@
+--[[
+LuCI - Lua Configuration Interface
+]]--
+
+local taskd = require "luci.model.tasks"
+local docker = require "luci.docker"
+local immich_model = require "luci.model.immich"
+local m, s, o
+
+m = taskd.docker_map("immich", "immich", "/usr/libexec/istorec/immich.sh",
+	translate("Immich"),
+	translate("Immich is a self-host photo and video management solution.")
+		.. translate("Official website:") .. ' <a href=\"https://immich.app/\" target=\"_blank\">https://immich.app/</a>')
+
+local dk = docker.new({socket_path="/var/run/docker.sock"})
+local dockerd_running = dk:_ping().code == 200
+local docker_info = dockerd_running and dk:info().body or {}
+local docker_aspace = 0
+if docker_info.DockerRootDir then
+	local statvfs = nixio.fs.statvfs(docker_info.DockerRootDir)
+	docker_aspace = statvfs and (statvfs.bavail * statvfs.bsize) or 0
+end
+
+s = m:section(SimpleSection, translate("Service Status"), translate("Immich status:"))
+s:append(Template("immich/status"))
+
+s = m:section(TypedSection, "main", translate("Setup"),
+		(docker_aspace < 2147483648 and
+		(translate("The free space of Docker is less than 2GB, which may cause the installation to fail.") 
+		.. "<br>") or "") .. translate("The following parameters will only take effect during installation or upgrade:"))
+s.addremove=false
+s.anonymous=true
+
+o = s:option(Value, "port", translate("Port").."<b>*</b>")
+o.default = "2283"
+o.datatype = "port"
+
+o = s:option(Value, "image_ver", translate("Image").."<b>*</b>")
+o.rmempty = false
+o.datatype = "string"
+o.default = "release"
+o:value("release", "release")
+
+local blocks = immich_model.blocks()
+local home = immich_model.home()
+
+o = s:option(Value, "config_path", translate("Config path").."<b>*</b>")
+o.rmempty = false
+o.datatype = "string"
+
+local paths, default_path = immich_model.find_paths(blocks, home, "Configs")
+for _, val in pairs(paths) do
+  o:value(val, val)
+end
+o.default = default_path
+
+o = s:option(Value, "db_password", "DB_PASSWORD".."<b>*</b>")
+o.rmempty = false
+o.default = "postgres"
+o.datatype = "string"
+o.password = true
+
+return m
--- a/luci-app-immich/luasrc/model/immich.lua
+++ b/luci-app-immich/luasrc/model/immich.lua
@ -0,0 +1,55 @@
+local util  = require "luci.util"
+local jsonc = require "luci.jsonc"
+
+local immich = {}
+
+immich.blocks = function()
+  local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r")
+  local vals = {}
+  if f then
+    local ret = f:read("*all")
+    f:close()
+    local obj = jsonc.parse(ret)
+    for _, val in pairs(obj["blockdevices"]) do
+      local fsize = val["fssize"]
+      if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then
+        -- fsize > 1G
+        vals[#vals+1] = val["mountpoint"]
+      end
+    end
+  end
+  return vals
+end
+
+immich.home = function()
+  local uci = require "luci.model.uci".cursor()
+  local home_dirs = {}
+  home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root")
+  home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs")
+  home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public")
+  home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads")
+  home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches")
+  return home_dirs
+end
+
+immich.find_paths = function(blocks, home_dirs, path_name)
+  local default_path = ''
+  local configs = {}
+
+  default_path = home_dirs[path_name] .. "/Immich"
+  if #blocks == 0 then
+    table.insert(configs, default_path)
+  else
+    for _, val in pairs(blocks) do 
+      table.insert(configs, val .. "/" .. path_name .. "/Immich")
+    end
+    local without_conf_dir = "/root/" .. path_name .. "/Immich"
+    if default_path == without_conf_dir then
+      default_path = configs[1]
+    end
+  end
+
+  return configs, default_path
+end
+
+return immich
--- a/luci-app-immich/luasrc/view/immich/status.htm
+++ b/luci-app-immich/luasrc/view/immich/status.htm
@ -0,0 +1,31 @@
+<%
+local util  = require "luci.util"
+local container_status = util.trim(util.exec("/usr/libexec/istorec/immich.sh status"))
+local container_install = (string.len(container_status) > 0)
+local container_running = container_status == "running"
+-%>
+<div class="cbi-value">
+    <label class="cbi-value-title"><%:Status%></label>
+    <div class="cbi-value-field">
+        <% if container_running then %>
+        <button class="cbi-button cbi-button-success" disabled="true"><%:Immich is running%></button>
+        <% else %>
+        <button class="cbi-button cbi-button-negative" disabled="true"><%:Immich is not running%></button>
+        <% end %>
+    </div>
+</div>
+<%
+if container_running then
+    local port=util.trim(util.exec("/usr/libexec/istorec/immich.sh port"))
+    if port == "" then
+        port="2283"
+    end
+-%>
+<div class="cbi-value cbi-value-last">
+    <label class="cbi-value-title">&nbsp;</label>
+    <div class="cbi-value-field">
+
+    <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Immich%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
+    </div>
+</div>
+<% end %>
--- a/luci-app-immich/po/zh-cn/immich.po
+++ b/luci-app-immich/po/zh-cn/immich.po
@ -0,0 +1,48 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Official website:"
+msgstr "官方网站："
+
+msgid "Immich"
+msgstr "Immich画板"
+
+msgid "Immich is a self-host photo and video management solution."
+msgstr "Immich 是私有化的相册视频管理工具。很占资源，网络好而且高性能设备推荐。"
+
+msgid "Config path"
+msgstr "配置文件路径"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Service Status"
+msgstr "服务状态"
+
+msgid "Immich status:"
+msgstr "Immich 的状态信息如下："
+
+msgid "Setup"
+msgstr "安装配置"
+
+msgid "The following parameters will only take effect during installation or upgrade:"
+msgstr "以下参数只在安装或者升级时才会生效："
+
+msgid "Status"
+msgstr "状态"
+
+msgid "Immich is running"
+msgstr "Immich 运行中"
+
+msgid "Immich is not running"
+msgstr "Immich 未运行"
+
+msgid "Open Immich"
+msgstr "打开 Immich"
+
+msgid "The free space of Docker is less than 2GB, which may cause the installation to fail."
+msgstr "Docker 可用空间已不足2GB，可能导致安装失败。"
+
+msgid "Please make sure there has enough space"
+msgstr "请确保有足够空间"
+
--- a/luci-app-immich/po/zh_Hans
+++ b/luci-app-immich/po/zh_Hans
@ -0,0 +1 @@
+zh-cn
--- a/luci-app-immich/root/etc/config/immich
+++ b/luci-app-immich/root/etc/config/immich
@ -0,0 +1,5 @@
+config main
+#	option 'port' ''
+#	option 'config_path' ''
+#	option 'image_ver' ''
+
--- a/luci-app-immich/root/usr/libexec/istorec/immich.sh
+++ b/luci-app-immich/root/usr/libexec/istorec/immich.sh
@ -0,0 +1,94 @@
+#!/bin/sh
+# Author Xiaobao(xiaobao@linkease.com)
+
+ACTION=${1}
+shift 1
+
+do_install() {
+  local port=`uci get immich.@main[0].port 2>/dev/null`
+  local config=`uci get immich.@main[0].config_path 2>/dev/null`
+  local IMMICH_VERSION=`uci get immich.@main[0].image_ver 2>/dev/null`
+  local DB_PASSWORD=`uci get immich.@main[0].db_password 2>/dev/null`
+
+  if [ -z "$config" ]; then
+    echo "config path is empty!"
+    exit 1
+  fi
+
+  mkdir -p $config
+  RET=$?
+  if [ ! "$RET" = "0" ]; then
+    echo "mkdir config path failed"
+    exit 1
+  fi
+
+  [ -z $port ] && port=2283
+  [ -z $DB_PASSWORD ] && DB_PASSWORD = "postgres"
+  [ -z $IMMICH_VERSION ] && IMMICH_VERSION = "release"
+  cp /usr/share/immich/docker-compose.yaml $config/docker-compose.yaml
+  sed 's/$port_var/'$port'/g; s/$immich_version_var/'$IMMICH_VERSION'/g; s/$db_password_var/'$DB_PASSWORD'/g' /usr/share/immich/env > $config/.env
+  RET=$?
+  if [ ! "$RET" = "0" ]; then
+    echo "convert docker-compose.yaml failed"
+    exit 1
+  fi
+
+  cd $config
+  export COMPOSE_PROJECT_NAME=linkease-immich
+  docker pull tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
+  RET=$?
+  if [ ! "$RET" = "0" ]; then
+    echo "download failed"
+    exit 1
+  fi
+  docker pull "immich-app/immich-machine-learning:$IMMICH_VERSION"
+  RET=$?
+  if [ ! "$RET" = "0" ]; then
+    echo "download failed"
+    exit 1
+  fi
+  docker pull "immich-app/immich-server:$IMMICH_VERSION"
+  RET=$?
+  if [ ! "$RET" = "0" ]; then
+    echo "download failed"
+    exit 1
+  fi
+  docker-compose down || true
+  docker-compose up -d
+}
+
+usage() {
+  echo "usage: $0 sub-command"
+  echo "where sub-command is one of:"
+  echo "      install                Install the immich"
+  echo "      upgrade                Upgrade the immich"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart the immich"
+  echo "      status                 Immich status"
+  echo "      port                   Immich port"
+}
+
+case ${ACTION} in
+  "install")
+    do_install
+  ;;
+  "upgrade")
+    do_install
+  ;;
+  "rm")
+    docker rm -f immich
+  ;;
+  "start" | "stop" | "restart")
+    config=`uci get immich.@main[0].config_path 2>/dev/null`
+    cd $config && docker-compose ${ACTION}
+  ;;
+  "status")
+    docker ps --all -f 'name=^/linkease-immich_frontend_1$' --format '{{.State}}'
+  ;;
+  "port")
+    docker ps --all -f 'name=^/linkease-immich_frontend_1$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+  ;;
+  *)
+    usage
+    exit 1
+  ;;
+esac
--- a/luci-app-immich/root/usr/share/immich/docker-compose.yaml
+++ b/luci-app-immich/root/usr/share/immich/docker-compose.yaml
@ -0,0 +1,87 @@
+#
+# WARNING: Make sure to use the docker-compose.yml of the current release:
+#
+# https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
+#
+# The compose file on main may not be compatible with the latest release.
+#
+
+name: immich
+
+services:
+  immich-server:
+    container_name: immich_server
+    image: immich-app/immich-server:${IMMICH_VERSION:-release}
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
+    volumes:
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - /etc/localtime:/etc/localtime:ro
+    env_file:
+      - .env
+    ports:
+      - ${PORT}:2283
+    depends_on:
+      - redis
+      - database
+    restart: always
+    healthcheck:
+      disable: false
+
+  immich-machine-learning:
+    container_name: immich_machine_learning
+    # For hardware acceleration, add one of -[armnn, cuda, openvino] to the image tag.
+    # Example tag: ${IMMICH_VERSION:-release}-cuda
+    image: immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
+    # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/ml-hardware-acceleration
+    #   file: hwaccel.ml.yml
+    #   service: cpu # set to one of [armnn, cuda, openvino, openvino-wsl] for accelerated inference - use the `-wsl` version for WSL2 where applicable
+    volumes:
+      - model-cache:/cache
+    env_file:
+      - .env
+    restart: always
+    healthcheck:
+      disable: false
+
+  redis:
+    container_name: immich_redis
+    image: redis:6.2-alpine@sha256:905c4ee67b8e0aa955331960d2aa745781e6bd89afc44a8584bfd13bc890f0ae
+    healthcheck:
+      test: redis-cli ping || exit 1
+    restart: always
+
+  database:
+    container_name: immich_postgres
+    image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
+      POSTGRES_INITDB_ARGS: '--data-checksums'
+    volumes:
+      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
+      - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    healthcheck:
+      test: >-
+        pg_isready --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" || exit 1;
+        Chksum="$$(psql --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" --tuples-only --no-align
+        --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')";
+        echo "checksum failure count is $$Chksum";
+        [ "$$Chksum" = '0' ] || exit 1
+      interval: 5m
+      start_period: 5m
+    command: >-
+      postgres
+      -c shared_preload_libraries=vectors.so
+      -c 'search_path="$$user", public, vectors'
+      -c logging_collector=on
+      -c max_wal_size=2GB
+      -c shared_buffers=512MB
+      -c wal_compression=on
+    restart: always
+
+volumes:
+  model-cache:
--- a/luci-app-immich/root/usr/share/immich/env
+++ b/luci-app-immich/root/usr/share/immich/env
@ -0,0 +1,22 @@
+# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
+
+# The location where your uploaded files are stored
+UPLOAD_LOCATION=./library
+# The location where your database files are stored
+DB_DATA_LOCATION=./postgres
+
+# To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
+# TZ=Etc/UTC
+
+# The Immich version to use. You can pin this to a specific version like "v1.71.0"
+IMMICH_VERSION=$immich_version_var
+
+# Connection secret for postgres. You should change it to a random password
+# Please use only the characters `A-Za-z0-9`, without special characters or spaces
+DB_PASSWORD=$db_password_var
+PORT=$port_var
+
+# The values below this line do not need to be changed
+###################################################################################
+DB_USERNAME=postgres
+DB_DATABASE_NAME=immich
--- a/luci-app-immich/root/usr/share/rpcd/acl.d/luci-app-immich.json
+++ b/luci-app-immich/root/usr/share/rpcd/acl.d/luci-app-immich.json
@ -0,0 +1,11 @@
+{
+	"luci-app-immich": {
+		"description": "Grant UCI access for luci-app-immich",
+		"read": {
+			"uci": [ "immich" ]
+		},
+		"write": {
+			"uci": [ "immich" ]
+		}
+	}
+}
--- a/luci-app-nekobox/htdocs/nekobox/ping.php
+++ b/luci-app-nekobox/htdocs/nekobox/ping.php
@ -669,6 +669,24 @@ $lang = $_GET['lang'] ?? 'en';
        display: none;
    }
 }
+
+@media (max-width: 768px) {
+    .popup {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 10px;
+        padding: 10px;
+        justify-content: center;
+        max-width: 100%;
+        box-sizing: border-box;
+    }
+    .popup button {
+        width: 100%; 
+        padding: 10px;
+        font-size: 14px;
+        box-sizing: border-box;
+    }
+}
 </style>
 <script src="./assets/bootstrap/Sortable.min.js"></script>
 <link href="./assets/bootstrap/video-js.css" rel="stylesheet" />
@ -989,7 +1007,7 @@ let IP = {
                <span id="toggle-ip" style="cursor: pointer; position: relative; top: -3px;  text-indent: 1ch; padding-top: 2px;" title="点击隐藏/显示 IP">
                    <i class="fa ${isHidden ? 'bi-eye-slash' : 'bi-eye'}"></i>  
                </span>
-                <span class="control-toggle" style="cursor: pointer; margin-left: 10px; display: inline-flex; align-items: center; position: relative; top: -1px;"" onclick="togglePopup()" title="打开控制面板">
+                <span class="control-toggle" style="cursor: pointer; margin-left: 10px; display: inline-flex; align-items: center; position: relative; top: -1px;" onclick="togglePopup()" title="打开控制面板">
                    <i class="bi bi-gear" style="font-size: 0.8rem; margin-right: 5px;"></i>  
                </span>
            `;
@ -1452,20 +1470,6 @@ setInterval(IP.getIpipnetIP, 180000);
        });
    });

-    var longPressTimer;
-    var touchStartTime = 0;
-
-    document.addEventListener('touchstart', function (event) {
-        var touch = event.touches[0];
-        touchStartTime = new Date().getTime();
-    
-        if (touch.clientY < window.innerHeight / 2) {
-            longPressTimer = setTimeout(function () {
-                togglePopup();
-            }, 1000); 
-        }
-    });
-
    function togglePopup() {
        var popup = document.getElementById('popup');
    
@ -2668,7 +2672,6 @@ window.addEventListener('keydown', function(event) {
                    <li><strong>Ctrl + Shift + C键:</strong> 清空缓存数据</li>
                    <li><strong>Ctrl + Shift + V键:</strong> 定制播放列表</li>
                    <li><strong>Ctrl + Shift + X键:</strong> 设置城市</li>
-                    <li><strong>手机/平板长按上半屏:</strong> 打开设置</li>
                </ul>
                <div class="sing-box-section mt-4">
                    <h5>Sing-box启动提示</h5>
@ -3881,56 +3884,76 @@ input[type="range"]:focus {

 #videoPlayerModal .modal-body {
    display: flex;
-    gap: 20px;
+    gap: 0;
    height: calc(90vh - 140px);
+    overflow: hidden;
+    align-items: stretch;
 }

-#videoPlayerModal .w-75 {
-    flex: 0 0 75%;
-    padding-right: 20px;
-    height: 100%;
-}
-
-#videoPlayerModal #videoPlayer {
+#videoPlayerModal .media-container {
+    flex: 1;
+    display: flex;
+    background-color: #000;
    border-radius: 10px;
+    overflow: hidden;
+}
+
+#videoPlayerModal #videoPlayer,
+#videoPlayerModal #audioPlayer,
+#videoPlayerModal #imageViewer {
+    border-radius: 10px 0 0 10px;
    width: 100%;
    height: 100%;
    background-color: #000;
 }

-#videoPlayerModal .w-25 {
-    flex: 0 0 25%;
+#videoPlayerModal .playlist-container {
+    width: 350px;
    height: 100%;
    display: flex;
    flex-direction: column;
+    border-left: 2px solid #007bff;
+    background-color: #111;
+    border-radius: 0 10px 10px 0;
+    padding: 15px;
+    padding-bottom: -10px;
+    overflow-x: hidden;
 }

 #videoPlayerModal #playlist {
    list-style-type: none;
-    padding-left: 0;
+    padding: 0;
    margin: 0;
-    overflow-y: auto;
-    max-height: 100%;
+    flex-grow: 1;
    background-color: #000;
+    border: 2px solid #007bff;
    border-radius: 10px;
-    width: 100%;
+    overflow-y: auto;
+    height: 100%;
+    overflow-x: hidden;
+}
+
+#videoPlayerModal #playlist::-webkit-scrollbar {
+    width: 8px;
+}
+
+#videoPlayerModal #playlist::-webkit-scrollbar-thumb {
+    background-color: #007bff;
+    border-radius: 4px;
 }

 #videoPlayerModal #playlist li {
    font-size: 1rem;
    padding: 12px 20px;
    border-radius: 8px;
-    margin-bottom: 10px;
+    margin: 5px;
    background-color: #333;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
    cursor: pointer;
-    transition: background-color 0.3s, box-shadow 0.3s;
 }

 #videoPlayerModal #playlist li:hover {
    background-color: #007bff;
    color: white;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
 }

 #videoPlayerModal #playlist li.active {
@ -3939,27 +3962,48 @@ input[type="range"]:focus {
 }

@media (max-width: 768px) {
-    #videoPlayerModal .modal-dialog {
-        max-width: 100%;
-        margin: 0;
+    .button-group {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 10px;
    }

-    #videoPlayerModal .modal-body {
-        flex-direction: column;
+    .btn {
+        width: 48%;
+        margin-bottom: 10px;
    }

-    #videoPlayerModal .w-75,
-    #videoPlayerModal .w-25 {
+    .btn-group {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+    }
+}
+
+@media (max-width: 768px) {
+    .playlist-container {
+        display: none;
+    }
+
+    .media-container {
+        display: block;
+    }
+
+    #videoPlayer, #audioPlayer, #imageViewer {
        width: 100%;
    }

-    .set-background-btn {
-        font-size: 12px;
-        padding: 5px 10px;
-        width: 100px;
-        height: 42px;
+    #toggleButton {
+        display: block;
+        margin-bottom: 15px;
+        text-align: center;
+    }
+
+    .modal-body {
+        padding: 10px;
    }
 }
+
 </style>

 <script>
@ -4210,15 +4254,15 @@ input[type="range"]:focus {
                <h5 class="modal-title" id="videoPlayerModalLabel">媒体播放器</h5>
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
            </div>
-            <div class="modal-body d-flex">
-                <div class="w-75 pe-3">
-                    <video id="videoPlayer" controls preload="auto" width="100%" height="400px" style="display: none;"></video>
-                    <audio id="audioPlayer" controls preload="auto" style="width: 100%; display: none;"></audio>
-                    <img id="imageViewer" src="" style="width: 100%; height: 400px; object-fit: contain; display: none;">
+            <div class="modal-body">
+                <div class="media-container">
+                    <video id="videoPlayer" controls preload="auto" style="display: none;"></video>
+                    <audio id="audioPlayer" controls preload="auto" style="display: none;"></audio>
+                    <img id="imageViewer" src="" style="display: none;">
                </div>
-                <div class="w-25 d-flex flex-column">
+                <div class="playlist-container">
                    <h5>播放列表</h5>
-                    <ul id="playlist" class="list-group flex-grow-1 overflow-auto"></ul>
+                    <ul id="playlist"></ul>
                </div>
            </div>
            <div class="modal-footer">
@ -4466,6 +4510,20 @@ function openVideoPlayerModal() {
 function savePlaylistToLocalStorage() {
    localStorage.setItem('playlist', JSON.stringify(playlist));
 }
+
+function toggleView() {
+    const mediaContainer = document.querySelector('.media-container');
+    const playlistContainer = document.querySelector('.playlist-container');
+
+    if (mediaContainer.style.display === "none") {
+        mediaContainer.style.display = "block";
+        playlistContainer.style.display = "none";
+    } else {
+        mediaContainer.style.display = "none";
+        playlistContainer.style.display = "block";
+    }
+}
+
 </script>

 <script>
@ -4489,6 +4547,11 @@ function savePlaylistToLocalStorage() {

    document.addEventListener('DOMContentLoaded', (event) => {
        var el = document.getElementById('fileTableBody');
+
+        if (window.innerWidth <= 768) {
+            return; 
+        }
+
        var sortable = new Sortable(el, {
            animation: 150,
            onEnd: function (evt) {
--- a/luci-app-nekobox/root/etc/neko/ui/zashboard/assets/index-C-TyyLqu.css
+++ b/luci-app-nekobox/root/etc/neko/ui/zashboard/assets/index-C-TyyLqu.css
--- a/luci-app-nekobox/root/etc/neko/ui/zashboard/assets/index-CZtXO6Q-.js
+++ b/luci-app-nekobox/root/etc/neko/ui/zashboard/assets/index-CZtXO6Q-.js
--- a/luci-app-nekobox/root/etc/neko/ui/zashboard/index.html
+++ b/luci-app-nekobox/root/etc/neko/ui/zashboard/index.html
@ -33,8 +33,8 @@
      name="theme-color"
      content="#FFFFFF"
    />
-    <script type="module" crossorigin src="./assets/index-DDAGPxZI.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-BHD-VcUO.css">
+    <script type="module" crossorigin src="./assets/index-CZtXO6Q-.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-C-TyyLqu.css">
  <link rel="manifest" href="./manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="./registerSW.js"></script></head>
  <body class="overflow-hidden overscroll-none">
    <div id="app"></div>
--- a/luci-app-nekobox/root/etc/neko/ui/zashboard/sw.js
+++ b/luci-app-nekobox/root/etc/neko/ui/zashboard/sw.js
@ -1 +1 @@
-if(!self.define){let e,i={};const s=(s,n)=>(s=new URL(s+".js",n).href,i[s]||new Promise((i=>{if("document"in self){const e=document.createElement("script");e.src=s,e.onload=i,document.head.appendChild(e)}else e=s,importScripts(s),i()})).then((()=>{let e=i[s];if(!e)throw new Error(`Module ${s} didn’t register its module`);return e})));self.define=(n,r)=>{const d=e||("document"in self?document.currentScript.src:"")||location.href;if(i[d])return;let f={};const c=e=>s(e,d),o={module:{uri:d},exports:f,require:c};i[d]=Promise.all(n.map((e=>o[e]||c(e)))).then((e=>(r(...e),f)))}}define(["./workbox-3e8df8c8"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"assets/index-BHD-VcUO.css",revision:null},{url:"assets/index-DDAGPxZI.js",revision:null},{url:"index.html",revision:"d71d20b8a12d4c852ded77080da2c4ab"},{url:"registerSW.js",revision:"402b66900e731ca748771b6fc5e7a068"},{url:"favicon.svg",revision:"7f1c4521acc10694fefef8f72dd2ea5f"},{url:"pwa-192x192.png",revision:"021df52501f4357c03eebd808f40dc6a"},{url:"pwa-512x512.png",revision:"d2f759aaabcb2c44ff52b27fde3de6e0"},{url:"pwa-maskable-192x192.png",revision:"7cd11dc5f0490b349d23eef5591d10e5"},{url:"pwa-maskable-512x512.png",revision:"8c97dc367a85a5a1eba523b24f79d03b"},{url:"manifest.webmanifest",revision:"c452912633990899ffe790f985ad0db9"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html")))}));
+if(!self.define){let e,i={};const s=(s,n)=>(s=new URL(s+".js",n).href,i[s]||new Promise((i=>{if("document"in self){const e=document.createElement("script");e.src=s,e.onload=i,document.head.appendChild(e)}else e=s,importScripts(s),i()})).then((()=>{let e=i[s];if(!e)throw new Error(`Module ${s} didn’t register its module`);return e})));self.define=(n,r)=>{const f=e||("document"in self?document.currentScript.src:"")||location.href;if(i[f])return;let o={};const t=e=>s(e,f),d={module:{uri:f},exports:o,require:t};i[f]=Promise.all(n.map((e=>d[e]||t(e)))).then((e=>(r(...e),o)))}}define(["./workbox-3e8df8c8"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"assets/index-C-TyyLqu.css",revision:null},{url:"assets/index-CZtXO6Q-.js",revision:null},{url:"index.html",revision:"94b371387a41af135c99e8fd2ab29751"},{url:"registerSW.js",revision:"402b66900e731ca748771b6fc5e7a068"},{url:"favicon.svg",revision:"7f1c4521acc10694fefef8f72dd2ea5f"},{url:"pwa-192x192.png",revision:"021df52501f4357c03eebd808f40dc6a"},{url:"pwa-512x512.png",revision:"d2f759aaabcb2c44ff52b27fde3de6e0"},{url:"pwa-maskable-192x192.png",revision:"7cd11dc5f0490b349d23eef5591d10e5"},{url:"pwa-maskable-512x512.png",revision:"8c97dc367a85a5a1eba523b24f79d03b"},{url:"manifest.webmanifest",revision:"c452912633990899ffe790f985ad0db9"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html")))}));
--- a/luci-app-nekobox/root/etc/neko/ui/zashboard/version.txt
+++ b/luci-app-nekobox/root/etc/neko/ui/zashboard/version.txt
@ -1 +1 @@
-v1.60.2
+v1.61.0
--- a/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
+++ b/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
@ -171,6 +171,7 @@
 			return new Promise((resolve, reject) => {
 				new XHR().get('<%=url('admin/network/get_app_filter')%>', null,
 					function (x, data) {
+							if (Array.isArray(data.app_list))
 						app_filter_data = data.app_list;
 						resolve(); 
 					}
@ -440,4 +441,4 @@
            <button type="button" class="submit-button" onclick="submitHandle()">保存</button>
        </div>
    </div>
-</div>
+</div>
--- a/luci-app-oaf/luasrc/view/admin_network/user.htm
+++ b/luci-app-oaf/luasrc/view/admin_network/user.htm
@ -121,7 +121,8 @@
    function getAllUsersData() {
        new XHR().get('<%=url('admin/network/get_all_users')%>', {flag: 2, page: 0},
            function (x, data) {
-                allUsers = data.data.list;
+ 				if (Array.isArray(data.data.list))  
+                	allUsers = data.data.list;
                renderAutoUserData();
            }
        );
@ -131,7 +132,10 @@
    function getAppFilterUserData() {
        new XHR().get('<%=url('admin/network/get_app_filter_user')%>', null,
            function (x, data) {
+
                userData = data.data;
+				if (!Array.isArray(userData.list))                                  
+                	userData.list=[]   
                renderUserData();
                render_mode_description(userData.mode);
            }
@ -358,4 +362,4 @@
        <div style="background-color: rgba(0, 0, 0, 0.5); padding: 10px; border-radius: 5px; text-align: center; width: 100px; height: 70px; color: white; display: flex; justify-content: center; align-items: center;">
            <p style="margin: 0;">设置成功</p>
        </div>
-    </div>
+    </div>
--- a/luci-app-oaf/luasrc/view/admin_network/user_status.htm
+++ b/luci-app-oaf/luasrc/view/admin_network/user_status.htm
@ -115,7 +115,9 @@
 						</div>
 					`;
 					tr.insertCell(-1).innerHTML = user_list[i].ip;
-
+					// lua api return {}
+				     if (!Array.isArray(user_list[i].applist))           
+                         user_list[i].applist = [] 
 					var app_list_str = user_list[i].applist.map(app => {
 						// Assuming app.name corresponds to the app's icon filename
 						return `<img src="<%=resource%>/app_icons/${app.id}.png" alt="${app.name}" title="${app.name}" style="width: 20px; height: 20px; border-radius: 5px; margin-right: 8px;">`;
@ -635,4 +637,4 @@
        padding: 2px !important; /* Remove padding from table cells */
    }

-</style>
+</style>
--- a/luci-theme-argon/Makefile
+++ b/luci-theme-argon/Makefile
@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk

 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=+curl +jsonfilter
-PKG_VERSION:=2.3.1
-PKG_RELEASE:=20230420
+PKG_VERSION:=2.3.2
+PKG_RELEASE:=20250207

 CONFIG_LUCI_CSSTIDY:=

--- a/luci-theme-argon/README.md
+++ b/luci-theme-argon/README.md
@ -69,6 +69,10 @@ It also supports automatic and manual switching between light and dark modes.
 - Automatically switch between light and dark modes with the system, and can also be set to a fixed mode.
 - Settings plugin with extensions [luci-app-argon-config][config-link]

+> **Upcoming Version **
+>
+> "The current theme uses Less for CSS construction, and the method for switching between light and dark modes is relatively primitive. Meanwhile, the official theme has already switched to the UT template. I am exploring a way to build the theme template using modern front-end development tools, initially settling on a solution using Vite + UnoCSS. This approach will utilize a proxy server for debugging and also support HMR (Hot Module Replacement), significantly improving development speed. Currently, the basic development framework has been set up, but due to a busy schedule, I still need some time to migrate the existing styles. Stay tuned!"
+
 ## Branch Introduction

 There are currently two main branches that are adapted to different versions of the **OpenWrt** source code.  
@ -77,7 +81,7 @@ The table below will provide a detailed introduction:
 | Branch | Version | Description                        | Matching source                                           |
 | ------ | ------- | ---------------------------------- | --------------------------------------------------------- |
 | master | v2.x.x  | Support the latest version of LuCI | [Official OpenWrt][official] • [ImmortalWrt][immortalwrt] |
-| 18.06  | v1.x.x  | Support the 18.06 version of LuCI  | [Lean's LEDE][lede]                                         |
+| 18.06 (deprecated) | v1.x.x  | Support the 18.06 version of LuCI   | [Lean's LEDE][lede]                                         |

 ## Version History

@ -85,7 +89,7 @@ The latest version is v2.3.1 [Click here][en-us-release-log] to view the full ve

 ## Getting started

-### Build for Lean's LEDE project
+### Build for Lean's LEDE project (deprecated)

 ```bash
 cd lede/package/lean
@ -116,7 +120,7 @@ opkg install luci-theme-argon*.ipk
 ```bash
 opkg install luci-compat
 opkg install luci-lib-ipkg
-wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.3.1/luci-theme-argon_2.3.1_all.ipk
+wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.3.2/luci-theme-argon-2.3.2-r20250207.apk
 opkg install luci-theme-argon*.ipk
 ```

--- a/luci-theme-argon/README_ZH.md
+++ b/luci-theme-argon/README_ZH.md
@ -116,7 +116,7 @@ opkg install luci-theme-argon*.ipk
 ```bash
 opkg install luci-compat
 opkg install luci-lib-ipkg
-wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.3.1/luci-theme-argon_2.3.1_all.ipk
+wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.3.2/luci-theme-argon-2.3.2-r20250207.apk
 opkg install luci-theme-argon*.ipk
 ```

--- a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css
+++ b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css
--- a/luci-theme-argon/htdocs/luci-static/argon/css/dark.css
+++ b/luci-theme-argon/htdocs/luci-static/argon/css/dark.css
--- a/luci-theme-argon/less/cascade.less
+++ b/luci-theme-argon/less/cascade.less
@ -979,6 +979,7 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] {

 .notice {
  background-color: #11cdef !important;
+  background-color: var(--primary) !important;
  color: #fff;
 }

@ -1611,7 +1612,7 @@ tr > th,
    }
  }

-  #modal_overlay > .modal.cbi-modal > div > p > textarea{
+  #modal_overlay > .modal.cbi-modal > div > p > textarea {
    height: 20em!important;
    border: 1px solid #dee2e6!important;
    border-radius: 4px;
@ -2699,7 +2700,7 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
    display: block;
    position: absolute;
    height: 100%;
-    background-color: var(--bar-bg);
+    background-color: var(--primary);
    border-radius: 0.5rem;
    transition: width 0.3s;
  }
@ -3301,21 +3302,20 @@ span[data-tooltip] .label {
 }

 .cbi-tooltip {
-  position: absolute;
+  position: absolute; 
  z-index: 1000;
-  top: -1000px;
-  left: -1000px;
-  padding: 2px 5px;
-  transition: opacity .25s ease-out;
-  white-space: pre;
-  pointer-events: none;
-  opacity: 0;
+  left: -10000px;
+  box-shadow: 0 0 2px #8b8b8b;
  border-radius: 3px;
  background: #fff;
-  box-shadow: 0 0 2px #444;
+  white-space: pre;
+  padding: 2px 5px;
+  opacity: 0;
+  transition: opacity .25s ease-in;
+  transform: translate(-50%, 10%);
 }

-.cbi-tooltip-container:hover .cbi-tooltip {
+.cbi-tooltip-container:hover .cbi-tooltip:not(:empty) {
  left: auto;
  transition: opacity .25s ease-in;
  opacity: 1;
--- a/luci-theme-argon/less/dark.less
+++ b/luci-theme-argon/less/dark.less
@ -502,6 +502,11 @@ textarea {
    background-color: #1e1e1e;
 }

+.cbi-section[id] .cbi-section-remove:nth-of-type(4n+3),
+.cbi-section[id] .cbi-section-node:nth-of-type(4n+4) {
+    background-color: #1e1e1e;
+}
+
 .node-system-packages > .main table tr td:nth-last-child(1) {
    color: #ccc;

@ -1099,6 +1104,10 @@ input,
        color: #fff !important;
        background-color: transparent !important;
    }
+
+    #modal_overlay > .modal.cbi-modal > div > p > textarea {
+        color: #ccc!important;
+    }
 }

 [data-page="admin-network-firewall-rules"] {
@ -1172,4 +1181,4 @@ input,
 .btn {
    background-color: rgb(112, 112, 112);
    color: #fff;
-}
+}
--- a/oaf/Makefile
+++ b/oaf/Makefile
@ -23,7 +23,7 @@ define KernelPackage/oaf/description
 endef


-EXTRA_CFLAGS:=-Wno-declaration-after-statement -Wno-strict-prototypes -Wno-unused-variable -Wno-implicit-fallthrough -Wno-missing-braces -Wno-parentheses
+EXTRA_CFLAGS:=-Wno-declaration-after-statement -Wno-strict-prototypes -Wno-unused-variable -Wno-implicit-fallthrough -Wno-missing-braces -Wno-parentheses -Wno-format



--- a/oaf/src/app_filter.c
+++ b/oaf/src/app_filter.c
@ -258,7 +258,6 @@ int add_app_feature(int appid, char *name, char *feature)
 		AF_ERROR("error, name or feature is null\n");
 		return -1;
 	}
-	printk("feature = %s\n", feature);
 	// tcp;8000;www.sina.com;0:get_name;00:0a-01:11
 	memset(&dport_info, 0x0, sizeof(dport_info));
 	while (*p++)
@ -291,19 +290,16 @@ int add_app_feature(int appid, char *name, char *feature)
 			break;
 		case AF_STR_PARAM_INDEX:
 			strncpy(search_str, begin, p - begin);
-			printk("search_str = %s\n", search_str);
 			break;
 		case AF_IGNORE_PARAM_INDEX:
 			strncpy(tmp_buf, begin, p - begin);
 			ignore = k_atoi(tmp_buf);
 			break;
 		}
-		printk("featuren = %s, param_num = %d\n", feature, param_num);
 		param_num++;
 		begin = p + 1;
 	}

-	printk("param_num = %d, ignore = %d, dict = %s\n", param_num, ignore, dict);
 	// old version
 	if (param_num == AF_DICT_PARAM_INDEX){
 		strncpy(dict, begin, p - begin);
@ -1250,7 +1246,7 @@ u_int32_t app_filter_hook_gateway_handle(struct sk_buff *skb, struct net_device
 	 if (TEST_MODE()){
 		if (flow.l4_protocol == IPPROTO_UDP){
 			if (flow.dport == 53 || flow.dport == 443){	
-				printk(" %s %pI4(%d)--> %pI4(%d) len = %d, %d ,pkt num = %d \n ", IPPROTO_TCP == flow.l4_protocol ? "tcp" : "udp",
+				printk(" %s %pI4(%d)--> %pI4(%d) len = %d, %d ,pkt num = %llu \n ", IPPROTO_TCP == flow.l4_protocol ? "tcp" : "udp",
 					&flow.src, flow.sport, &flow.dst, flow.dport, skb->len, flow.app_id, total_packets);				
 					print_hex_ascii(flow.l4_data, flow.l4_len > 64 ? 64 : flow.l4_len);
 			}
--- a/open-app-filter/src/appfilter.h
+++ b/open-app-filter/src/appfilter.h
@ -100,6 +100,6 @@ typedef struct af_run_time_status{
    int match_time;
 }af_run_time_status_t;

-af_config_t g_af_config;

-#endif
+extern af_config_t g_af_config;
+#endif
--- a/open-app-filter/src/main.c
+++ b/open-app-filter/src/main.c
@ -37,6 +37,7 @@ THE SOFTWARE.
 int current_log_level = LOG_LEVEL_INFO;
 af_run_time_status_t g_af_status;
 int g_oaf_config_change = 0;
+af_config_t g_af_config;

 void af_init_time_status(void){
    g_af_status.filter = 0;
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@ -21,13 +21,13 @@ define Download/geoip
  HASH:=f2f5f03da44d007fa91fb6a37c077c9efae8ad0269ef0e4130cf90b0822873e3
 endef

-GEOSITE_VER:=20250206143205
+GEOSITE_VER:=20250207120917
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
  URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
  URL_FILE:=dlc.dat
  FILE:=$(GEOSITE_FILE)
-  HASH:=e574c0b74f46f53667aa6c62ea735952288ec20d3c56bbb74dd1411803db436d
+  HASH:=b0ece9a9c0d74ee647a502a5cc8266fe3931c3d530c2ad0fa508ed0fb9f7836e
 endef

 GEOSITE_IRAN_VER:=202502030035