update 2025-03-18 00:27:16

2025-04-04 03:01:27 +08:00 · 2025-03-18 00:27:16 +08:00 · 2025-03-18 00:27:16 +08:00 · 2dd9f91318
commit 2dd9f91318
parent b1af45d140
21 changed files with 71 additions and 44 deletions
--- a/luci-app-nikki/Makefile
+++ b/luci-app-nikki/Makefile
@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.21.0
+PKG_VERSION:=1.21.1

 LUCI_TITLE:=LuCI Support for nikki
 LUCI_DEPENDS:=+luci-base +nikki
--- a/luci-app-nikki/htdocs/luci-static/resources/tools/nikki.js
+++ b/luci-app-nikki/htdocs/luci-static/resources/tools/nikki.js
@ -105,8 +105,9 @@ return baseclass.extend({
    },

    api: async function (method, path, query, body) {
-        const apiListen = uci.get('nikki', 'mixin', 'api_listen');
-        const apiSecret = uci.get('nikki', 'mixin', 'api_secret') ?? '';
+        const profile = await callNikkiProfile();
+        const apiListen = profile['external-controller'];
+        const apiSecret = profile['secret'] ?? '';
        const apiPort = apiListen.substring(apiListen.lastIndexOf(':') + 1);
        const url = `http://${window.location.hostname}:${apiPort}${path}`;
        return request.request(url, {
@ -118,9 +119,10 @@ return baseclass.extend({
    },

    openDashboard: async function () {
-        const uiName = uci.get('nikki', 'mixin', 'ui_name');
-        const apiListen = uci.get('nikki', 'mixin', 'api_listen');
-        const apiSecret = uci.get('nikki', 'mixin', 'api_secret') ?? '';
+        const profile = await callNikkiProfile();
+        const uiName = profile['external-ui-name'];
+        const apiListen = profile['external-controller'];
+        const apiSecret = profile['secret'] ?? '';
        const apiPort = apiListen.substring(apiListen.lastIndexOf(':') + 1);
        const params = {
            host: window.location.hostname,
--- a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js
+++ b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/mixin.js
@ -125,7 +125,7 @@ return view.extend({

        o = s.taboption('external_control', form.Value, 'api_secret', _('API Secret'));
        o.password = true;
-        o.rmempty = false;
+        o.placeholder = _('Unmodified');

        o = s.taboption('external_control', form.ListValue, 'selection_cache', _('Save Proxy Selection'));
        o.optional = true;
--- a/luci-app-partexp/luasrc/model/cbi/partexp/global.lua
+++ b/luci-app-partexp/luasrc/model/cbi/partexp/global.lua
@ -7,18 +7,17 @@ local util = require "nixio.util"
 local tp   = require "luci.template.parser"
 local uci=luci.model.uci.cursor()
 luci.sys.exec("echo '-' >/tmp/partexp.log&&echo 1 > /tmp/lucilogpos" )
-  -- get all device names (sdX and mmcblkX)
-  local target_devnames = {}
-  for dev in fs.dir("/dev") do
+local target_devnames = {}
+for dev in fs.dir("/dev") do
    if dev:match("^sd[a-z]$")
      or dev:match("^mmcblk%d+$")
      or dev:match("^sata[a-z]$")
      or dev:match("^nvme%d+n%d+$")
-      or dev:match("^vd[a-z]$")
+      or dev:match("^vd[a-z]")
      then
-      table.insert(target_devnames, dev)
+        table.insert(target_devnames, dev)
    end
-  end
+end
  local devices = {}
  for i, bname in pairs(target_devnames) do
    local device_info = {}
@ -41,8 +40,6 @@ t.anonymous=true

 e=t:option(ListValue,"target_function", translate("Select function"),translate("Select the function to be performed"))
 e:value("/overlay", translate("Expand application space overlay (/overlay)"))
-- e:value("/", translate("Use as root filesystem (/)"))
-- e:value("/lnoverlay", translate("Soft chain partition expansion(/overlay)"))
 e:value("/opt", translate("Used as Docker data disk (/opt)"))
 e:value("/dev", translate("Normal mount and use by device name(/dev/x1)"))
 e.default="/opt"
@ -63,7 +60,6 @@ e.default=0
 e=t:option(Flag,'auto_format', translate('Format before use'),translate("Ticking indicates formatting"))
 e:depends("target_function", "/opt")
 e:depends("target_function", "/dev")
-- e:depends("target_function", "/lnoverlay")
 e.default=0

 e=t:option(Button, "restart", translate("Perform operation"))
--- a/luci-app-partexp/po/zh-cn/partexp.po
+++ b/luci-app-partexp/po/zh-cn/partexp.po
@ -45,6 +45,9 @@ msgstr "选择需要操作的硬盘设备"
 msgid "Select function"
 msgstr "选择功能"

+msgid "Select the function to be performed"
+msgstr "选择要执行的功能"
+
 msgid "Click to execute"
 msgstr "点击执行"

@ -73,4 +76,4 @@ msgid "Ticking indicates formatting"
 msgstr "打勾选择表示格式化"

 msgid "Tick means to retain the settings"
-msgstr "打勾选择表示保留设置"
+msgstr "打勾选择表示保留设置"
--- a/luci-app-partexp/po/zh_Hans/partexp.po
+++ b/luci-app-partexp/po/zh_Hans/partexp.po
@ -45,6 +45,9 @@ msgstr "选择需要操作的硬盘设备"
 msgid "Select function"
 msgstr "选择功能"

+msgid "Select the function to be performed"
+msgstr "选择要执行的功能"
+
 msgid "Click to execute"
 msgstr "点击执行"

--- a/luci-app-partexp/root/etc/init.d/partexp
+++ b/luci-app-partexp/root/etc/init.d/partexp
@ -185,7 +185,7 @@ fdiskB(){
 		usamba samba4 $MOUNT
 		usamba samba $MOUNT
 		sleep 5
-		umount $MOUNT || block umount /dev/$b
+		umount $MOUNT || block umount /dev/$b   >/dev/null 2> /dev/null 
 		sleep 5
 		MOUNT='';eval $(block info "/dev/$b" | grep -o -e "MOUNT=\S*")
 		if [ "x$MOUNT" != 'x'  ] ;then
@ -215,7 +215,7 @@ fdiskB(){
 	[ -d "/mnt/$b" ] || mkdir -p /mnt/$b
 	MOUNT='';eval $(block info "/dev/$b" | grep -o -e "MOUNT=\S*") 
 	if [  "x$MOUNT" != 'x'  ] ;then
-	     umount /mnt/$b || block umount /dev/$b
+	     umount /mnt/$b || block umount /dev/$b   >/dev/null 2> /dev/null 
 	     MOUNT='';eval $(block info "/dev/$b" | grep -o -e "MOUNT=\S*") 
 	     if [ "$MOUNT" ] ; then
 	     	log "检测设备/dev/$b被占用,请检查设备硬件或中止其他插件等占用权限再重试！" 
@ -249,7 +249,7 @@ fdiskB(){
 			    mount --bind / /tmp/introot
 			    tar -C /tmp/introot -cvf - . | tar -C /mnt/$b -xf -
 			    umount /tmp/introot || block umount /tmp/introot
-			    umount /mnt/$b || block umount /dev/$b
+			    umount /mnt/$b || block umount /dev/$b   >/dev/null 2> /dev/null 
 			    block detect > /etc/config/fstab
 			    OVERLAY=`uci -q get fstab.@mount[0].target `
 			    if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then
@ -268,7 +268,7 @@ fdiskB(){
 		
 			    # cp -a -f /overlay/*  /mnt/$b/  || cp -a -f /rom/overlay/*  /mnt/$b/
 			    tar -C /overlay -cvf - . | tar -C /mnt/$b/ -xf -  || tar -C /rom/overlay -cvf - . | tar -C /mnt/$b/ -xf - 
-			    umount /mnt/$b || block umount /dev/$b
+			    umount /mnt/$b || block umount /dev/$b  >/dev/null 2> /dev/null 
 			    block detect > /etc/config/fstab
 			    OVERLAY=`uci -q get fstab.@mount[0].target `
 			    if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then
@ -295,7 +295,7 @@ fdiskB(){

 		else
 			    
-			    umount /mnt/$b || block umount /dev/$b
+			    umount /mnt/$b || block umount /dev/$b  >/dev/null 2> /dev/null 
 			    block detect > /etc/config/fstab
 			    OVERLAY=`uci -q get fstab.@mount[0].target `
 			    if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then
@ -323,7 +323,7 @@ fdiskB(){

 		fi
 	elif [ "$target_function" = "/lnoverlay" ] ; then
-		umount /mnt/$b || block umount /dev/$b
+		umount /mnt/$b || block umount /dev/$b    >/dev/null 2> /dev/null 
 		
 		block detect > /etc/config/fstab
 		mkdir -p $target_function
@ -343,7 +343,7 @@ fdiskB(){
 		log "设备重启才能生效"
 		expquit 2
 	else 
-		umount /mnt/$b || block umount /dev/$b
+		umount /mnt/$b || block umount /dev/$b  >/dev/null 2> /dev/null 
 		
 		block detect > /etc/config/fstab
 		mkdir -p $target_function
@ -374,7 +374,7 @@ get_system_disk() {
 }

 get_all_disks() {
-    DISKS=`fdisk -l 2>/dev/null | grep -E '^Disk /dev/' | awk -F ',' '{print $1}'`
+    DISKS=`find /dev -regex '.*/\(sd[a-z]\|mmcblk[0-9]\+\|sata[a-z]\|nvme[0-9]\+n[0-9]\+\|vd[a-z]\)$'`
    echo "$DISKS"
 }

@ -388,7 +388,7 @@ check_free_space() {
 # 定义函数：获取下一个新的可用的分区号
 get_next_partition_number() {
    DISK=$1
-    PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot  | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g')
+    PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot  | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g' | awk -F '[^0-9]+' '{print $NF}')
    MAX_PARTITION=$(echo "$PARTITIONS" | sort -n | tail -n 1)
    NEXT_PARTITION=$(awk -v n="$MAX_PARTITION" 'BEGIN { print n + 1 }')
    #NEXT_PARTITION=$((MAX_PARTITION + 1))
@ -398,7 +398,7 @@ get_next_partition_number() {
 # 定义函数：获取最后一个可用的分区号
 get_last_partition_number() {
    DISK=$1
-    PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot  | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g')
+    PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot  | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g' | awk -F '[^0-9]+' '{print $NF}')
    MAX_PARTITION=$(echo "$PARTITIONS" | sort -n | tail -n 1)
    echo "$MAX_PARTITION"
 }
@ -465,7 +465,7 @@ autopart() {

    		log  "定位到操作目标设备分区:/dev/$DISK$NEXTPART"
 		case "$DISK" in
-		vd*|sd*) fdiskB $DISK $NEXTPART;;
+		vd*) fdiskB $DISK $NEXTPART;;

 		sd*) fdiskB $DISK $NEXTPART;;
 		nvme*)  fdiskB $DISK p$NEXTPART;;
--- a/luci-app-passwall/luasrc/controller/passwall.lua
+++ b/luci-app-passwall/luasrc/controller/passwall.lua
@ -192,7 +192,7 @@ function get_redir_log()
 		proto = "TCP"
 	end
 	if fs.access(path .. "/" .. proto .. ".log") then
-		local content = luci.sys.exec("cat ".. path .. "/" .. proto .. ".log")
+		local content = luci.sys.exec("tail -n 19999 ".. path .. "/" .. proto .. ".log")
 		content = content:gsub("\n", "<br />")
 		luci.http.write(content)
 	else
@ -216,7 +216,7 @@ function get_chinadns_log()
 	local flag = luci.http.formvalue("flag")
 	local path = "/tmp/etc/passwall/acl/" .. flag .. "/chinadns_ng.log"
 	if fs.access(path) then
-		local content = luci.sys.exec("cat ".. path)
+		local content = luci.sys.exec("tail -n 5000 ".. path)
 		content = content:gsub("\n", "<br />")
 		luci.http.write(content)
 	else
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
@ -401,6 +401,10 @@ if singbox_tags:find("with_quic") then
 end

 if singbox_tags:find("with_quic") then
+	o = s:option(Value, _n("hysteria2_ports"), translate("Port hopping range"))
+	o.description = translate("Format as 1000:2000 Multiple groups are separated by commas (,).")
+	o:depends({ [_n("protocol")] = "hysteria2" })
+
 	o = s:option(Value, _n("hysteria2_up_mbps"), translate("Max upload Mbps"))
 	o:depends({ [_n("protocol")] = "hysteria2" })

--- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua
+++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua
@ -383,7 +383,17 @@ function gen_outbound(flag, node, tag, proxy_table)
 		end

 		if node.protocol == "hysteria2" then
+			local server_ports = {}
+			if node.hysteria2_ports then
+				for range in node.hysteria2_ports:gmatch("([^,]+)") do
+					if range:match("^%d+:%d+$") then
+						table.insert(server_ports, range)
+					end
+				end
+			end
 			protocol_table = {
+				server_ports = next(server_ports) and server_ports or nil,
+				hop_interval = next(server_ports) and "30s" or nil,
 				up_mbps = (node.hysteria2_up_mbps and tonumber(node.hysteria2_up_mbps)) and tonumber(node.hysteria2_up_mbps) or nil,
 				down_mbps = (node.hysteria2_down_mbps and tonumber(node.hysteria2_down_mbps)) and tonumber(node.hysteria2_down_mbps) or nil,
 				obfs = {
--- a/luci-app-passwall/po/zh-cn/passwall.po
+++ b/luci-app-passwall/po/zh-cn/passwall.po
@ -1821,3 +1821,9 @@ msgstr "中断现有连接"

 msgid "Interrupt existing connections when the selected outbound has changed."
 msgstr "当选择的出站发生变化时中断现有连接。"
+
+msgid "Port hopping range"
+msgstr "端口跳跃范围"
+
+msgid "Format as 1000:2000 Multiple groups are separated by commas (,)."
+msgstr "格式为：1000:2000 多组时用逗号(,)隔开。"
--- a/nikki/Makefile
+++ b/nikki/Makefile
@ -5,9 +5,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git
-PKG_SOURCE_DATE:=2025-03-14
-PKG_SOURCE_VERSION:=1e22f4daa964c54abea4c8b0f09f8171398a2821
-PKG_MIRROR_HASH:=0b65cd12cb6927b118d3802303b97dbc3299db1b3e6d8a849dedb32a276c30ff
+PKG_SOURCE_DATE:=2025-03-17
+PKG_SOURCE_VERSION:=e3d4ec247670dc88f8a3410e9bca2c69ca053f32
+PKG_MIRROR_HASH:=ab8e39fec0675a77d575acf5ed705bb327a5f9f2b8d72792896e884e491b25e6

 PKG_LICENSE:=GPL3.0+
 PKG_MAINTAINER:=Joseph Mory <morytyann@gmail.com>
@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_FLAGS:=no-mips16

-PKG_BUILD_VERSION:=alpha-1e22f4d
+PKG_BUILD_VERSION:=alpha-e3d4ec2
 PKG_BUILD_TIME:=$(shell date -u -Iseconds)

 GO_PKG:=github.com/metacubex/mihomo
--- a/nikki/files/nikki.conf
+++ b/nikki/files/nikki.conf
@ -41,10 +41,8 @@ config proxy 'proxy'
 	list 'bypass_cgroup' 'aria2'
 	list 'bypass_cgroup' 'dnsmasq'
 	list 'bypass_cgroup' 'netbird'
-	list 'bypass_cgroup' 'nginx'
 	list 'bypass_cgroup' 'qbittorrent'
 	list 'bypass_cgroup' 'tailscale'
-	list 'bypass_cgroup' 'uhttpd'
 	list 'bypass_cgroup' 'zerotier'
 	list 'bypass_dscp' '4'
 	option 'bypass_china_mainland_ip' '0'
--- a/nikki/files/uci-defaults/migrate.sh
+++ b/nikki/files/uci-defaults/migrate.sh
@ -70,10 +70,8 @@ proxy_bypass_cgroup=$(uci -q get nikki.proxy.bypass_cgroup); [ -z "$proxy_bypass
 	uci add_list nikki.proxy.bypass_cgroup=aria2
 	uci add_list nikki.proxy.bypass_cgroup=dnsmasq
 	uci add_list nikki.proxy.bypass_cgroup=netbird
-	uci add_list nikki.proxy.bypass_cgroup=nginx
 	uci add_list nikki.proxy.bypass_cgroup=qbittorrent
 	uci add_list nikki.proxy.bypass_cgroup=tailscale
-	uci add_list nikki.proxy.bypass_cgroup=uhttpd
 	uci add_list nikki.proxy.bypass_cgroup=zerotier
 }

--- a/open-app-filter/Makefile
+++ b/open-app-filter/Makefile
@ -2,12 +2,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=appfilter
-PKG_VERSION:=6.1.1
+PKG_VERSION:=6.1.3
 PKG_RELEASE:=1

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 include $(INCLUDE_DIR)/package.mk

+TARGET_CFLAGS +=-Werror=implicit-function-declaration
 define Package/appfilter
  SECTION:=TT Apps
  CATEGORY:=TT Apps
--- a/open-app-filter/src/appfilter_config.h
+++ b/open-app-filter/src/appfilter_config.h
@ -60,5 +60,7 @@ int af_get_uci_list_num(struct uci_context * ctx, char *package, char *section);
 int af_uci_get_array_value(struct uci_context *ctx, char *key_fmt, int index, char *output, int out_len);
 int af_uci_get_int_value(struct uci_context *ctx, char *key);
 int af_uci_get_value(struct uci_context *ctx, char *key, char *output, int out_len);
+int af_uci_add_section(struct uci_context * ctx, char *package_name, char *section);
+int af_uci_commit(struct uci_context *ctx, const char * package);
 #endif

--- a/open-app-filter/src/appfilter_netlink.c
+++ b/open-app-filter/src/appfilter_netlink.c
@ -37,6 +37,7 @@ THE SOFTWARE.
 #define MAX_NL_RCV_BUF_SIZE 4096

 #define REPORT_INTERVAL_SECS 60
+extern int hash_appid(int appid);
 void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
 {
    int ret;
--- a/open-app-filter/src/appfilter_ubus.c
+++ b/open-app-filter/src/appfilter_ubus.c
@ -37,6 +37,7 @@ THE SOFTWARE.
 #include "appfilter_config.h"
 #include <uci.h>
 #include "appfilter.h"
+#include "utils.h"

 extern int g_oaf_config_change;

--- a/open-app-filter/src/main.c
+++ b/open-app-filter/src/main.c
@ -35,6 +35,7 @@ THE SOFTWARE.
 #include <arpa/inet.h>
 #include "appfilter.h"
 #include <stdio.h>
+#include "utils.h"

 #define CMD_GET_LAN_IP_FMT   "ifconfig %s | grep 'inet addr' | awk '{print $2}' | awk -F: '{print $2}'"
 #define CMD_GET_LAN_MASK_FMT "ifconfig %s | grep 'inet addr' | awk '{print $4}' | awk -F: '{print $2}'"
@ -415,7 +416,7 @@ int af_load_feature_to_kernel(void){
 	if (!fp)
 	{
 		printf("open file failed\n");
-		return;
+		return -1;
 	}
 	if (af_nl_clean_feature() < 0){
        return -1;
--- a/open-app-filter/src/utils.c
+++ b/open-app-filter/src/utils.c
@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <ctype.h>


 char *str_trim(char *s) {
@ -98,4 +99,4 @@ int af_read_file_int_value(const char *file_path, int *value) {
    }
    *value = atoi(line_buf);
    return 0;
-}
+}
--- a/subconverter/Makefile
+++ b/subconverter/Makefile
@ -9,9 +9,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git
-PKG_SOURCE_DATE:=2024-04-18
-PKG_SOURCE_VERSION:=69749107340f4b0e46e0f30525c7142f70f50e55
-PKG_MIRROR_HASH:=0d117cd24e1c235399b2514588f39fb2566e6feae30c42ad6cac12dee4bdbc2f
+PKG_SOURCE_DATE:=2025-01-16
+PKG_SOURCE_VERSION:=92f66bf5b58be5b3e605bb481db5f5ffd6b2aa78
+PKG_MIRROR_HASH:=d04e64048c9cca880c0580aa795d347c2423ea71cb926e61bc68724664bb8e93
 PKG_VERSION:=0.9.0~$(call version_abbrev,$(PKG_SOURCE_VERSION))

 PKG_LICENSE:=GPL-3.0