同步源码于2024年03月10号-07点17分

luci-theme-atmaterial_new/luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.223
+PKG_VERSION:=3.1.224
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-theme-atmaterial_new/luci-app-amlogic/root/usr/sbin/openwrt-kernel

@@ -425,6 +425,11 @@ sos_kernel() {
         cp -rf /boot/{*-${kernel_signature},uInitrd,*Image,dtb} .
         [[ "${?}" -ne "0" ]] && error_msg "(1/2) [ boot ] kernel files rescue failed."
         echo -e "(1/2) [ boot ] kernel files rescue succeeded."
+
+        [[ -f "/boot/emmc_autoscript.cmd" ]] && cp -f /boot/emmc_autoscript.cmd .
+        [[ -f "/boot/emmc_autoscript" ]] && cp -f /boot/emmc_autoscript .
+        [[ -f "/boot/s905_autoscript.cmd" ]] && cp -f /boot/s905_autoscript.cmd .
+        [[ -f "/boot/s905_autoscript" ]] && cp -f /boot/s905_autoscript .
     } || error_msg "(1/2) The [ ${P4_PATH}/bootfs ] folder does not exist, stop rescuing."
 
     # 02. For /lib/modules/${kernel_signature}

luci-theme-atmaterial_new/luci-app-openclash/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openclash
-PKG_VERSION:=0.46.001
+PKG_VERSION:=0.46.003
 PKG_RELEASE:=beta
 PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>
 

luci-theme-atmaterial_new/luci-app-openclash/luasrc/controller/openclash.lua

@@ -654,7 +654,7 @@ function set_subinfo_url()
 end
 
 function sub_info_get()
-	local filepath, filename, sub_url, sub_info, info, upload, download, total, expire, http_code, len, percent, day_left, day_expire
+	local filepath, filename, sub_url, sub_info, info, upload, download, total, expire, http_code, len, percent, day_left, day_expire, surplus, used
 	local info_tb = {}
 	filename = luci.http.formvalue("filename")
 	sub_info = ""
@@ -705,14 +705,14 @@ function sub_info_get()
 						else
 							day_left = 0
 						end
-
 						if used and total and used < total then
 							percent = string.format("%.1f",((total-used)/total)*100) or nil
 						elseif used == nil or total == nil or total == 0 then
 							percent = 100
 						else
 							percent = 0
 						end
+						surplus = fs.filesize(total - used) or "null"
 						total = fs.filesize(total) or "null"
 						used = fs.filesize(used) or "null"
 						sub_info = "Successful"
@@ -727,6 +727,7 @@ function sub_info_get()
 	luci.http.write_json({
 		http_code = http_code,
 		sub_info = sub_info,
+		surplus = surplus,
 		used = used,
 		total = total,
 		percent = percent,
@@ -1071,7 +1072,8 @@ function action_status()
 		db_forward_ssl = db_foward_ssl(),
 		web = is_web(),
 		cn_port = cn_port(),
-		restricted_mode = restricted_mode();
+		restricted_mode = restricted_mode(),
+		core_type = uci:get("openclash", "config", "core_type") or "Dev";
 	})
 end
 

luci-theme-atmaterial_new/luci-app-openclash/luasrc/model/cbi/openclash/settings.lua

@@ -236,6 +236,10 @@ o = s:taboption("traffic_control", Flag, "disable_udp_quic", font_red..bold_on..
 o.description = translate("Prevent YouTube and Others To Use QUIC Transmission")..", "..font_red..bold_on..translate("REJECT UDP Traffic(Not Include CN) On Port 443")..bold_off..font_off
 o.default = 1
 
+o = s:taboption("traffic_control", Flag, "skip_proxy_address", translate("Skip Proxy Address"))
+o.description = translate("Bypassing Server Addresses And Preventing Duplicate Proxies")
+o.default = 0
+
 o = s:taboption("traffic_control", Value, "common_ports", font_red..bold_on..translate("Common Ports Proxy Mode")..bold_off..font_off)
 o.description = translate("Only Common Ports, Prevent BT/P2P Passing")
 o:value("0", translate("Disable"))

luci-theme-atmaterial_new/luci-app-openclash/luasrc/view/openclash/status.htm

@@ -252,11 +252,11 @@
 		if ( x && x.status == 200 ) {
 			if ( status.restricted_mode != "1" )
 			{
-			   clash.innerHTML = status.clash ? '<b style=color:green><%:Running%></b>' : '<b style=color:red><%:Not Running%></b>';
+			   clash.innerHTML = status.clash ? '<b style=color:green>' + status.core_type +'&nbsp;&nbsp;&nbsp;<%:Running%></b>' : '<b style=color:red><%:Not Running%></b>';
 			}
 			else
 			{
-			   clash.innerHTML = status.clash ? '<b style=color:green><%:Running%> <%:<Limited State>%></b>' : '<b style=color:red><%:Not Running%></b>';
+			   clash.innerHTML = status.clash ? '<b style=color:green>' + status.core_type +'&nbsp;&nbsp;&nbsp;<%:Running%>&nbsp;&nbsp;&nbsp;<%:<Limited State>%></b>' : '<b style=color:red><%:Not Running%></b>';
 			}
 			watchdog.innerHTML = status.watchdog ? '&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<%:Daemons%>:&nbsp;&nbsp;&nbsp;<b style=color:green><%:Running%></b>' : '&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<%:Daemons%>:&nbsp;&nbsp;&nbsp;<b style=color:red><%:Not Running%></b>';
 			dase.innerHTML = status.dase ? "<b style=color:green>"+status.dase+"</b>" : "<b style=color:red>"+"<%:Not Set%>"+"</b>";

luci-theme-atmaterial_new/luci-app-openclash/luasrc/view/openclash/sub_info_show.htm

@@ -72,8 +72,7 @@
 			retry_<%=idname%> = 0;
 			localStorage.setItem("<%=filename%>",JSON.stringify(status));
 			document.getElementById('<%=idname%>').className = "sub_tab_show";
-			document.getElementById('<%=idname%>').innerHTML = progressbar_<%=idname%>((status.used), (status.total), (status.percent), false, false, (status.expire), (status.day_left));
-			//document.getElementById('<%=idname%>').innerHTML = "<%:Plan Traffic%>" + ": " + "<span style=color:green>" + status.used + "</span> | <span style=color:green>" + status.total + "</span> <br/> <%:Plan Expiration Time%>: " + "<span style=color:green>" + status.expire + "</span>";
+			document.getElementById('<%=idname%>').innerHTML = progressbar_<%=idname%>((status.surplus ? status.surplus : status.used), (status.total), (status.percent), false, false, (status.expire), (status.day_left));
 		}
 		else if ( x && x.status == 200 && status.sub_info == "No Sub Info Found" ) {
 			retry_<%=idname%> = 0;
@@ -110,8 +109,7 @@
 			document.getElementById('<%=idname%>').innerHTML = "<span><%:No Sub Info Found%></span>";
 		}
 		else {
-			//document.getElementById('<%=idname%>').innerHTML = "<%:Plan Traffic%>" + ": " + "<span style=color:green>" + save_info.used + "</span> | <span style=color:green>" + save_info.total + "</span> <br/> <%:Plan Expiration Time%>: " + "<span style=color:green>" + save_info.expire + "</span>";
-			document.getElementById('<%=idname%>').innerHTML = progressbar_<%=idname%>((save_info.used), (save_info.total), (save_info.percent ? save_info.percent : 0), false, false, (save_info.expire), (save_info.day_left ? save_info.day_left : 0));
+			document.getElementById('<%=idname%>').innerHTML = progressbar_<%=idname%>((save_info.surplus ? save_info.surplus : save_info.used), (save_info.total), (save_info.percent ? save_info.percent : 0), false, false, (save_info.expire), (save_info.day_left ? save_info.day_left : 0));
 		}
 	}
 	else {

luci-theme-atmaterial_new/luci-app-openclash/po/zh-cn/openclash.zh-cn.po

@@ -3240,6 +3240,9 @@ msgstr "大陆域名 DNS 服务器"
 msgid "Specify DNS Server For CN Domain Lists, Only One IP Server Address Support"
 msgstr "指定大陆域名的 DNS 服务器，只支持填写一个IP地址"
 
+msgid "Warning: Dnsmasq Work is Unnormal, Setting The Firewall DNS Hijacking Rules..."
+msgstr "警告：检测到 Dnsmasq 工作异常，设置防火墙 DNS 劫持规则..."
+
 msgid "Tip: Dnsmasq Work is Normal, Restore The Firewall DNS Hijacking Rules..."
 msgstr "提示：检测到 Dnsmasq 正常工作，还原防火墙 DNS 劫持规则..."
 
@@ -3487,4 +3490,10 @@ msgid "Error: Set Fallback DNS Proxy Group Failed,"
 msgstr "错误：Fallback DNS 代理策略组设置失败，"
 
 msgid "To Use in Fake-IP Mode, Please Switch The Dns Redirect Mode To Firewall Forwarding"
-msgstr "要在 Fake-IP 模式下使用，请将 Dns 重定向模式切换为防火墙转发模式"
+msgstr "要在 Fake-IP 模式下使用，请将 Dns 重定向模式切换为防火墙转发模式"
+
+msgid "Skip Proxy Address"
+msgstr "绕过服务器地址"
+
+msgid "Bypassing Server Addresses And Preventing Duplicate Proxies"
+msgstr "绕过服务器地址，防止重复代理"

luci-theme-atmaterial_new/luci-app-openclash/root/etc/uci-defaults/luci-openclash

@@ -213,6 +213,7 @@ uci -q set network.utun=interface
 uci -q set network.utun.proto=none
 uci -q set network.utun.ifname=utun
 uci -q set network.utun.device=utun
+uci -q set network.utun.auto='0'
 uci -q commit network
 
 config_load "firewall"