From 5665025a5cd6a31a1da4cfb4593b7483450dd618 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Wed, 1 Jan 2025 20:37:00 +0800
Subject: [PATCH] update 2025-01-01 20:37:00

---
 luci-app-nekobox/htdocs/nekobox/index.php     | 20 +++++++++++++--
 .../passwall/node_list/link_share_man.htm     | 25 +++++++++++--------
 .../root/usr/share/passwall/subscribe.lua     |  6 +++--
 xray-core/Makefile                            |  4 +--
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/luci-app-nekobox/htdocs/nekobox/index.php b/luci-app-nekobox/htdocs/nekobox/index.php
index 923379129..99b9ce8dc 100644
--- a/luci-app-nekobox/htdocs/nekobox/index.php
+++ b/luci-app-nekobox/htdocs/nekobox/index.php
@@ -978,7 +978,7 @@ window.onload = function() {
 <h2 class="text-center">日志</h2>
 <ul class="nav nav-pills mb-3" id="logTabs" role="tablist">
     <li class="nav-item" role="presentation">
-        <a class="nav-link active" id="pluginLogTab" data-bs-toggle="pill" href="#pluginLog" role="tab" aria-controls="pluginLog" aria-selected="true">NeKoBox 日志</a>
+        <a class="nav-link" id="pluginLogTab" data-bs-toggle="pill" href="#pluginLog" role="tab" aria-controls="pluginLog" aria-selected="true">NeKoBox 日志</a>
     </li>
     <li class="nav-item" role="presentation">
         <a class="nav-link" id="mihomoLogTab" data-bs-toggle="pill" href="#mihomoLog" role="tab" aria-controls="mihomoLog" aria-selected="false">Mihomo 日志</a>
@@ -989,7 +989,7 @@ window.onload = function() {
 </ul>
 
 <div class="tab-content" id="logTabsContent">
-    <div class="tab-pane fade show active" id="pluginLog" role="tabpanel" aria-labelledby="pluginLogTab">
+    <div class="tab-pane fade" id="pluginLog" role="tabpanel" aria-labelledby="pluginLogTab">
         <div class="card log-card">
             <div class="card-body">
                 <pre id="plugin_log" class="log-container form-control" style="resize: vertical; overflow: auto; height: 350px; white-space: pre-wrap;" contenteditable="true"></pre>
@@ -1148,6 +1148,22 @@ window.onload = function() {
     });
 </script>
 
+<script>
+    window.addEventListener('load', function() {
+        const activeTab = localStorage.getItem('activeTab') || 'pluginLogTab'; 
+        const activeTabLink = document.getElementById(activeTab);
+        const activeTabPane = document.getElementById(activeTab.replace('Tab', ''));      
+        activeTabLink.classList.add('active');  
+        activeTabPane.classList.add('show', 'active');  
+    });
+
+    document.querySelectorAll('.nav-link').forEach(tab => {
+        tab.addEventListener('click', function() {
+            const selectedTab = this.id;
+            localStorage.setItem('activeTab', selectedTab); 
+        });
+    });
+</script>
 </body>
 </html>
     <footer class="text-center">
diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
index 1df050c00..80cc37cc1 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
@@ -829,10 +829,10 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 					}
 
 					queryParam.type = queryParam.type.toLowerCase();
-					if (queryParam.type === "kcp" || queryParam.type === "mkcp") {
+					if (queryParam.type === "kcp") {
 						queryParam.type = "mkcp";
 					}
-					if (queryParam.type === "h2" || queryParam.type === "http") {
+					if (queryParam.type === "h2") {
 						queryParam.type = "http";
 					}
 					if (dom_prefix == "singbox_" && queryParam.type === "raw") {
@@ -872,7 +872,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 								opt.set(dom_prefix + 'ws_earlyDataHeaderName', 'Sec-WebSocket-Protocol');
 							}
 						}
-					} else if (queryParam.type === "h2" || queryParam.type === "http") {
+					} else if (queryParam.type === "http") {
 						if (dom_prefix == "xray_") {
 							opt.set(dom_prefix + 'xhttp_mode', "stream-one");
 							opt.set(dom_prefix + 'xhttp_host', queryParam.host || "");
@@ -885,7 +885,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 						opt.set(dom_prefix + 'quic_guise', queryParam.headerType || "none");
 						opt.set(dom_prefix + 'quic_security', queryParam.quicSecurity);
 						opt.set(dom_prefix + 'quic_key', queryParam.key);
-					} else if (queryParam.type === "kcp" || queryParam.type === "mkcp") {
+					} else if (queryParam.type === "mkcp") {
 						opt.set(dom_prefix + 'mkcp_guise', queryParam.headerType || "none");
 					} else if (queryParam.type === "grpc") {
 						opt.set(dom_prefix + 'grpc_serviceName', (queryParam.serviceName || queryParam.path) || "");
@@ -961,10 +961,10 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 			opt.set(dom_prefix + 'password', decodeURIComponent(password));
 
 			queryParam.type = queryParam.type ? queryParam.type.toLowerCase() : "tcp";
-			if (queryParam.type === "kcp" || queryParam.type === "mkcp") {
+			if (queryParam.type === "kcp") {
 				queryParam.type = "mkcp";
 			}
-			if (queryParam.type === "h2" || queryParam.type === "http") {
+			if (queryParam.type === "h2") {
 				queryParam.type = "http";
 			}
 			if (dom_prefix == "singbox_" && queryParam.type === "raw") {
@@ -1004,7 +1004,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 						opt.set(dom_prefix + 'ws_earlyDataHeaderName', 'Sec-WebSocket-Protocol');
 					}
 				}
-			} else if (queryParam.type === "h2" || queryParam.type === "http") {
+			} else if (queryParam.type === "http") {
 				if (dom_prefix == "xray_") {
 					opt.set(dom_prefix + 'xhttp_mode', "stream-one");
 					opt.set(dom_prefix + 'xhttp_host', queryParam.host || "");
@@ -1017,7 +1017,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 				opt.set(dom_prefix + 'quic_guise', queryParam.headerType || "none");
 				opt.set(dom_prefix + 'quic_security', queryParam.quicSecurity);
 				opt.set(dom_prefix + 'quic_key', queryParam.key);
-			} else if (queryParam.type === "kcp" || queryParam.type === "mkcp") {
+			} else if (queryParam.type === "mkcp") {
 				opt.set(dom_prefix + 'mkcp_guise', queryParam.headerType || "none");
 			} else if (queryParam.type === "grpc") {
 				opt.set(dom_prefix + 'grpc_serviceName', (queryParam.serviceName || queryParam.path) || "");
@@ -1198,12 +1198,15 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 			}
 
 			queryParam.type = queryParam.type.toLowerCase();
-			if (queryParam.type === "kcp" || queryParam.type === "mkcp") {
+			if (queryParam.type === "kcp") {
 				queryParam.type = "mkcp";
 			}
-			if (queryParam.type === "h2" || queryParam.type === "http") {
+			if (queryParam.type === "h2") {
 				queryParam.type = "http";
 			}
+			if (queryParam.type === "splithttp") {
+				queryParam.type = "xhttp";
+			}
 			if (dom_prefix == "singbox_" && queryParam.type === "raw") {
 				queryParam.type = "tcp";
 			} else if (dom_prefix == "xray_" && queryParam.type === "tcp") {
@@ -1259,7 +1262,7 @@ local hysteria2_type = map:get("@global_subscribe[0]", "hysteria2_type") or "sin
 			} else if (queryParam.type === "grpc") {
 				opt.set(dom_prefix + 'grpc_serviceName', (queryParam.serviceName || queryParam.path) || "");
 				opt.set(dom_prefix + 'grpc_mode', queryParam.mode || "gun");
-			} else if (queryParam.type === "xhttp" || queryParam.type === "splithttp") {
+			} else if (queryParam.type === "xhttp") {
 				opt.set(dom_prefix + 'xhttp_host', queryParam.host || "");
 				opt.set(dom_prefix + 'xhttp_path', queryParam.path || "");
 				opt.set(dom_prefix + 'xhttp_mode', queryParam.mode || "auto");
diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index a0232d607..8f66cef70 100755
--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -465,6 +465,7 @@ local function processData(szType, content, add_mode, add_from)
 		elseif result.type == "Xray" and info.net == "tcp" then
 			info.net = "raw"
 		end
+		if info.net == "splithttp" then info.net = "xhttp" end
 		if info.net == 'h2' or info.net == 'http' then
 			info.net = "http"
 			result.transport = (result.type == "Xray") and "xhttp" or "http"
@@ -527,7 +528,7 @@ local function processData(szType, content, add_mode, add_from)
 		if info.net == 'grpc' then
 			result.grpc_serviceName = info.path
 		end
-		if info.net == 'xhttp' or info.net == 'splithttp' then
+		if info.net == 'xhttp' then
 			result.xhttp_host = info.host
 			result.xhttp_path = info.path
 		end
@@ -974,6 +975,7 @@ local function processData(szType, content, add_mode, add_from)
 			elseif result.type == "Xray" and params.type == "tcp" then
 				params.type = "raw"
 			end
+			if params.type == "splithttp" then params.type = "xhttp" end
 			if params.type == "h2" or params.type == "http" then
 				params.type = "http"
 				result.transport = (result.type == "Xray") and "xhttp" or "http"
@@ -1037,7 +1039,7 @@ local function processData(szType, content, add_mode, add_from)
 				if params.serviceName then result.grpc_serviceName = params.serviceName end
 				result.grpc_mode = params.mode or "gun"
 			end
-			if params.type == 'xhttp' or params.type == 'splithttp' then
+			if params.type == 'xhttp' then
 				result.xhttp_host = params.host
 				result.xhttp_path = params.path
 				result.xhttp_mode = params.mode or "auto"
diff --git a/xray-core/Makefile b/xray-core/Makefile
index 86e07cceb..e6e12d044 100644
--- a/xray-core/Makefile
+++ b/xray-core/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xray-core
-PKG_VERSION:=24.12.18
+PKG_VERSION:=24.12.31
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3d8b4a161a263e7af7bb1a2690961da075d13f980acd806f5cd4e5c8338d7534
+PKG_HASH:=e3c24b561ab422785ee8b7d4a15e44db159d9aa249eb29a36ad1519c15267be0
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MPL-2.0