update 2023-12-08 16:24:00

2023-12-08 16:24:00 +08:00 · 2023-12-08 16:24:00 +08:00 · 11565242c9
parent ac8505fc16
commit 11565242c9
54 changed files with 150 additions and 62 deletions
--- a/luci-app-bmtedge/Makefile
+++ b/luci-app-bmtedge/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.1-20231020
+PKG_VERSION:=1.0.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for bmtedge
--- a/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh
+++ b/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh
@ -37,7 +37,7 @@ do_install() {
    -e ksc_net=\"$netdev\" \
    -e ksc_machine_code=\"lsyK17032_$uid\" "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd --name bmtedge \"$image_name\""
--- a/luci-app-chinesesubfinder/Makefile
+++ b/luci-app-chinesesubfinder/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.2-20230215
+PKG_VERSION:=1.0.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for ChineseSubFinder
--- a/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh
+++ b/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh
@ -29,7 +29,7 @@ do_install() {
     --log-driver \"json-file\" \
     --log-opt \"max-size=100m\" "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  [ -z "$media" ] || cmd="$cmd -v \"$media:/media\""
--- a/luci-app-codeserver/Makefile
+++ b/luci-app-codeserver/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.1-20230108
+PKG_VERSION:=1.0.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for CodeServer
--- a/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh
+++ b/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh
@ -31,7 +31,7 @@ do_install() {
    -e DEFAULT_WORKSPACE=/config/workspace \
    -p $http_port:8443 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  [ -z "$env_password" ] || cmd="$cmd -e \"PASSWORD=$env_password\""
--- a/luci-app-emby/Makefile
+++ b/luci-app-emby/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.3-20231117
+PKG_VERSION:=1.0.3-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Emby
--- a/luci-app-emby/root/usr/libexec/istorec/emby.sh
+++ b/luci-app-emby/root/usr/libexec/istorec/emby.sh
@ -43,7 +43,7 @@ do_install() {
    -p $http_port:8096 "
  fi

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/cache\""
--- a/luci-app-gogs/Makefile
+++ b/luci-app-gogs/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.1-20230108
+PKG_VERSION:=1.0.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Emby
--- a/luci-app-gogs/root/usr/libexec/istorec/gogs.sh
+++ b/luci-app-gogs/root/usr/libexec/istorec/gogs.sh
@ -32,7 +32,7 @@ do_install() {
    -p $http_port:3000 \
    -p $ssh_port:22 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-heimdall/Makefile
+++ b/luci-app-heimdall/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.1-20230108
+PKG_VERSION:=1.1.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for heimdall
--- a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
+++ b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
@ -38,7 +38,7 @@ do_install_detail() {
  cmd="$cmd -v /mnt:/mnt"
  mountpoint -q /mnt && cmd="$cmd:rslave"

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd --name heimdall \"$IMAGE_NAME\""
--- a/luci-app-homeassistant/Makefile
+++ b/luci-app-homeassistant/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.2-20230312
+PKG_VERSION:=1.1.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for homeassistant
--- a/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh
+++ b/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh
@ -24,7 +24,7 @@ do_install() {
    --dns=127.0.0.1 "

  if [ -z "$tz" ]; then
-    tz="`uci get system.@system[0].zonename`"
+    tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  fi
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

--- a/luci-app-jackett/Makefile
+++ b/luci-app-jackett/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.1-20230108
+PKG_VERSION:=1.1.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for jackett
--- a/luci-app-jackett/root/usr/libexec/istorec/jackett.sh
+++ b/luci-app-jackett/root/usr/libexec/istorec/jackett.sh
@ -32,7 +32,7 @@ do_install() {
    --dns=172.17.0.1 \
    -p $port:9117 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  if [ -n "$auto_update" ]; then
--- a/luci-app-jellyfin/Makefile
+++ b/luci-app-jellyfin/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.8-20230619
+PKG_VERSION:=1.1.8-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for jellyfin
--- a/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua
+++ b/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua
@ -12,7 +12,7 @@ m = taskd.docker_map("jellyfin", "jellyfin", "/usr/libexec/istorec/jellyfin.sh",
 		.. translate("Official website:") .. ' <a href=\"https://jellyfin.org/\" target=\"_blank\">https://jellyfin.org/</a>'
 		.. "<dl><dt>" .. translate("The following models support hardware transcoding without configuration in Jellyfin:") .. "</dt>"
 		.. "<dd>- Easepi ARS2</dd>"
-		.. "<dd>- " .. translate("RK3568 series (e.g. R5S, R68s, R66s, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available.") .. "</dd>"
+		.. "<dd>- " .. translate("RK35xx series (e.g. R6S, R5S, R68s, R66s, H28K, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available.") .. "</dd>"
 		.. "<dt>" .. translate("The following models may support hardware transcoding by referring to the official Jellyfin documentation:") .. "</dt>"
 		.. "<dd>- " .. translate("x86 series") .. "</dd>"
 		.. "<dd>- " .. translate("Raspberry Pi series") .. "</dd>"
--- a/luci-app-jellyfin/po/zh-cn/jellyfin.po
+++ b/luci-app-jellyfin/po/zh-cn/jellyfin.po
@ -10,8 +10,8 @@ msgstr "Jellyfin 是志愿者构建的媒体解决方案，可让您控制自己
 msgid "The following models support hardware transcoding without configuration in Jellyfin:"
 msgstr "以下机型无需在Jellyfin配置即支持硬件转码："

-msgid "RK3568 series (e.g. R5S, R68s, R66s, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available."
-msgstr "RK3568 系列（例如R5S，R68s，R66s等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。"
+msgid "RK35xx series (e.g. R6S, R5S, R68s, R66s, H28K, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available."
+msgstr "RK35xx 系列（例如R6S，R5S，R68s，R66s，H28K等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。"

 msgid "The following models may support hardware transcoding by referring to the official Jellyfin documentation:"
 msgstr "以下机型参考 Jellyfin 官方文档配置可能支持硬件转码："
--- a/luci-app-jellyfin/root/etc/config/jellyfin
+++ b/luci-app-jellyfin/root/etc/config/jellyfin
@ -2,6 +2,6 @@ config jellyfin
 	option 'hostnet' '0'
 	option 'port' '8096'
 	option 'image' 'default'
-	option 'media_path' ''
-	option 'config_path' ''
-	option 'cache_path' ''
+#	option 'media_path' ''
+#	option 'config_path' ''
+#	option 'cache_path' ''
--- a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh
+++ b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh
@ -100,7 +100,7 @@ do_install_detail() {
    -p $port:8096 "
  fi

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\""
--- a/luci-app-lanraragi/Makefile
+++ b/luci-app-lanraragi/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.1-20230108
+PKG_VERSION:=1.0.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for LANraragi
--- a/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh
+++ b/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh
@ -28,7 +28,7 @@ do_install() {
    --dns=172.17.0.1 \
    -p $http_port:3000 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-memos/Makefile
+++ b/luci-app-memos/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.2-20230412
+PKG_VERSION:=1.0.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Memos
--- a/luci-app-memos/root/usr/libexec/istorec/memos.sh
+++ b/luci-app-memos/root/usr/libexec/istorec/memos.sh
@ -27,7 +27,7 @@ do_install() {
    --dns=172.17.0.1 \
    -p $http_port:5230 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-nastools/Makefile
+++ b/luci-app-nastools/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.3-20230215
+PKG_VERSION:=1.1.3-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for nastools
--- a/luci-app-nastools/root/usr/libexec/istorec/nastools.sh
+++ b/luci-app-nastools/root/usr/libexec/istorec/nastools.sh
@ -32,7 +32,7 @@ do_install() {
    -p $port:3000 \
    -e UMASK=000"

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  if [ -n "$auto_update" ]; then
--- a/luci-app-navidrome/Makefile
+++ b/luci-app-navidrome/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.1-20230108
+PKG_VERSION:=1.0.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Navidrome
--- a/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh
+++ b/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh
@ -28,7 +28,7 @@ do_install() {
    --dns=172.17.0.1 \
    -p $http_port:4533 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-nextcloud/Makefile
+++ b/luci-app-nextcloud/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.1-20230108
+PKG_VERSION:=1.1.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for nextcloud
--- a/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh
+++ b/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh
@ -38,7 +38,7 @@ do_install() {
  cmd="$cmd -v /mnt:/mnt"
  mountpoint -q /mnt && cmd="$cmd:rslave"

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd --name nextcloud \"$IMAGE_NAME\""
--- a/luci-app-owntone/Makefile
+++ b/luci-app-owntone/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.2-20230619
+PKG_VERSION:=1.0.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Owntone
--- a/luci-app-owntone/root/usr/libexec/istorec/owntone.sh
+++ b/luci-app-owntone/root/usr/libexec/istorec/owntone.sh
@ -25,7 +25,7 @@ do_install() {
    --dns=127.0.0.1 \
    --network=host "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=1.21-3
+PKG_VERSION:=1.21-4
 PKG_RELEASE:=

 PKG_CONFIG_DEPENDS:= \
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
@ -438,6 +438,7 @@ o = s:option(ListValue, option_name("transport"), translate("Transport"))
 o:value("tcp", "TCP")
 o:value("http", "HTTP")
 o:value("ws", "WebSocket")
+o:value("httpupgrade", "HTTPUpgrade")
 if singbox_tags:find("with_quic") then
 	o:value("quic", "QUIC")
 end
@ -509,6 +510,14 @@ o:depends({ [option_name("ws_enableEarlyData")] = true })
 o = s:option(Value, option_name("ws_earlyDataHeaderName"), translate("Early data header name"), translate("Recommended value: Sec-WebSocket-Protocol"))
 o:depends({ [option_name("ws_enableEarlyData")] = true })

+-- [[ HTTPUpgrade部分 ]]--
+o = s:option(Value, option_name("httpupgrade_host"), translate("HTTPUpgrade Host"))
+o:depends({ [option_name("transport")] = "httpupgrade" })
+
+o = s:option(Value, option_name("httpupgrade_path"), translate("HTTPUpgrade Path"))
+o.placeholder = "/"
+o:depends({ [option_name("transport")] = "httpupgrade" })
+
 -- [[ gRPC部分 ]]--
 o = s:option(Value, option_name("grpc_serviceName"), "ServiceName")
 o:depends({ [option_name("transport")] = "grpc" })
@ -533,8 +542,6 @@ o = s:option(Flag, option_name("mux"), translate("Mux"))
 o.rmempty = false
 o:depends({ [option_name("protocol")] = "vmess" })
 o:depends({ [option_name("protocol")] = "vless", [option_name("flow")] = "" })
-o:depends({ [option_name("protocol")] = "http" })
-o:depends({ [option_name("protocol")] = "socks" })
 o:depends({ [option_name("protocol")] = "shadowsocks", [option_name("uot")] = "" })
 o:depends({ [option_name("protocol")] = "trojan" })

@ -545,13 +552,26 @@ o:value("h2mux")
 o:depends({ [option_name("mux")] = true })

 o = s:option(Value, option_name("mux_concurrency"), translate("Mux concurrency"))
-o.default = 8
-o:depends({ [option_name("mux")] = true })
+o.default = 4
+o:depends({ [option_name("mux")] = true, [option_name("tcpbrutal")] = false })

 o = s:option(Flag, option_name("mux_padding"), translate("Padding"))
 o.default = 0
 o:depends({ [option_name("mux")] = true })

+-- [[ TCP Brutal ]]--
+o = s:option(Flag, option_name("tcpbrutal"), translate("TCP Brutal"))
+o.default = 0
+o:depends({ [option_name("mux")] = true })
+
+o = s:option(Value, option_name("tcpbrutal_up_mbps"), translate("Max upload Mbps"))
+o.default = "10"
+o:depends({ [option_name("tcpbrutal")] = true })
+
+o = s:option(Value, option_name("tcpbrutal_down_mbps"), translate("Max download Mbps"))
+o.default = "50"
+o:depends({ [option_name("tcpbrutal")] = true })
+
 o = s:option(Flag, option_name("shadowtls"), "ShadowTLS")
 o.default = 0
 o:depends({ [option_name("protocol")] = "vmess", [option_name("tls")] = false })
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua
@ -310,6 +310,7 @@ o = s:option(ListValue, option_name("transport"), translate("Transport"))
 o:value("tcp", "TCP")
 o:value("http", "HTTP")
 o:value("ws", "WebSocket")
+o:value("httpupgrade", "HTTPUpgrade")
 o:value("quic", "QUIC")
 o:value("grpc", "gRPC")
 o:depends({ [option_name("protocol")] = "shadowsocks" })
@ -333,10 +334,39 @@ o:depends({ [option_name("transport")] = "ws" })
 o = s:option(Value, option_name("ws_path"), translate("WebSocket Path"))
 o:depends({ [option_name("transport")] = "ws" })

+-- [[ HTTPUpgrade部分 ]]--
+
+o = s:option(Value, option_name("httpupgrade_host"), translate("HTTPUpgrade Host"))
+o:depends({ [option_name("transport")] = "httpupgrade" })
+
+o = s:option(Value, option_name("httpupgrade_path"), translate("HTTPUpgrade Path"))
+o:depends({ [option_name("transport")] = "httpupgrade" })
+
 -- [[ gRPC部分 ]]--
 o = s:option(Value, option_name("grpc_serviceName"), "ServiceName")
 o:depends({ [option_name("transport")] = "grpc" })

+-- [[ Mux ]]--
+o = s:option(Flag, option_name("mux"), translate("Mux"))
+o.rmempty = false
+o:depends({ [option_name("protocol")] = "vmess" })
+o:depends({ [option_name("protocol")] = "vless", [option_name("flow")] = "" })
+o:depends({ [option_name("protocol")] = "shadowsocks" })
+o:depends({ [option_name("protocol")] = "trojan" })
+
+-- [[ TCP Brutal ]]--
+o = s:option(Flag, option_name("tcpbrutal"), translate("TCP Brutal"))
+o.default = 0
+o:depends({ [option_name("mux")] = true })
+
+o = s:option(Value, option_name("tcpbrutal_up_mbps"), translate("Max upload Mbps"))
+o.default = "10"
+o:depends({ [option_name("tcpbrutal")] = true })
+
+o = s:option(Value, option_name("tcpbrutal_down_mbps"), translate("Max download Mbps"))
+o.default = "50"
+o:depends({ [option_name("tcpbrutal")] = true })
+
 o = s:option(Flag, option_name("bind_local"), translate("Bind Local"), translate("When selected, it can only be accessed locally, It is recommended to turn on when using reverse proxies or be fallback."))
 o.default = "0"

--- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
@ -117,10 +117,28 @@ function gen_outbound(flag, node, tag, proxy_table)
 			mux = {
 				enabled = true,
 				protocol = node.mux_type or "h2mux",
-				max_connections = tonumber(node.mux_concurrency) or 4,
-				padding = (node.mux_padding == "1") and true or false
+				max_connections = ( (node.tcpbrutal == "1") and 1 ) or tonumber(node.mux_concurrency) or 4,
+				padding = (node.mux_padding == "1") and true or false,
 				--min_streams = 4,
 				--max_streams = 0,
+				brutal = {
+					enabled = (node.tcpbrutal == "1") and true or false,
+					up_mbps = tonumber(node.tcpbrutal_up_mbps) or 10,
+					down_mbps = tonumber(node.tcpbrutal_down_mbps) or 50,
+				},
+			}
+		end
+
+		local mux = nil
+		if node.mux == "1" then
+			mux = {
+				enabled = true,
+				padding = (node.mux_padding == "1") and true or false,
+				brutal = {
+					enabled = (node.tcpbrutal == "1") and true or false,
+					up_mbps = tonumber(node.tcpbrutal_up_mbps) or 10,
+					down_mbps = tonumber(node.tcpbrutal_down_mbps) or 50,
+				},
 			}
 		end

@ -147,6 +165,14 @@ function gen_outbound(flag, node, tag, proxy_table)
 			}
 		end

+		if node.transport == "httpupgrade" then
+			v2ray_transport = {
+				type = "httpupgrade",
+				host = node.httpupgrade_host,
+				path = node.httpupgrade_path or "/",
+			}
+		end
+
 		if node.transport == "quic" then
 			v2ray_transport = {
 				type = "quic"
@ -422,6 +448,14 @@ function gen_config_server(node)
 		}
 	end

+	if node.transport == "httpupgrade" then
+		v2ray_transport = {
+			type = "httpupgrade",
+			host = node.httpupgrade_host,
+			path = node.httpupgrade_path or "/",
+		}
+	end
+
 	if node.transport == "quic" then
 		v2ray_transport = {
 			type = "quic"
@ -484,6 +518,7 @@ function gen_config_server(node)
 		protocol_table = {
 			method = node.method,
 			password = node.password,
+			multiplex = mux,
 		}
 	end

@ -500,6 +535,7 @@ function gen_config_server(node)
 			protocol_table = {
 				users = users,
 				tls = (node.tls == "1") and tls or nil,
+				multiplex = mux,
 				transport = v2ray_transport,
 			}
 		end
@ -518,6 +554,7 @@ function gen_config_server(node)
 			protocol_table = {
 				users = users,
 				tls = (node.tls == "1") and tls or nil,
+				multiplex = mux,
 				transport = v2ray_transport,
 			}
 		end
@ -537,6 +574,7 @@ function gen_config_server(node)
 				tls = (node.tls == "1") and tls or nil,
 				fallback = nil,
 				fallback_for_alpn = nil,
+				multiplex = mux,
 				transport = v2ray_transport,
 			}
 		end
--- a/luci-app-photoprism/Makefile
+++ b/luci-app-photoprism/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.3-20230804
+PKG_VERSION:=1.0.3-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for PhotoPrism
--- a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh
+++ b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh
@ -27,7 +27,7 @@ do_install() {
    -e PHOTOPRISM_UPLOAD_NSFW=\"true\" \
    -e PHOTOPRISM_ADMIN_PASSWORD=\"$password\" "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  [ -z "$picture" ] || cmd="$cmd -v \"$picture:/photoprism/originals\""
--- a/luci-app-plex/Makefile
+++ b/luci-app-plex/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.2-20230619
+PKG_VERSION:=1.0.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Plex
--- a/luci-app-plex/root/usr/libexec/istorec/plex.sh
+++ b/luci-app-plex/root/usr/libexec/istorec/plex.sh
@ -54,7 +54,7 @@ do_install() {
    -p $port:32400 "
  fi

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  [ -z "$claim_token" ] || cmd="$cmd -e \"PLEX_CLAIM=$claim_token\""
--- a/luci-app-ubuntu/Makefile
+++ b/luci-app-ubuntu/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.1-20230108
+PKG_VERSION:=1.1.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for ubuntu
--- a/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh
+++ b/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh
@ -44,7 +44,7 @@ do_install() {
    -e VNC_PW=${password} \
    -e VNC_USE_HTTP=0 "

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-unifi/Makefile
+++ b/luci-app-unifi/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.2-20230619
+PKG_VERSION:=1.0.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for UnifiController
--- a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh
+++ b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh
@ -37,7 +37,7 @@ do_install() {
    -p $http_port:8443 "
  fi

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-vaultwarden/Makefile
+++ b/luci-app-vaultwarden/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.1-20230108
+PKG_VERSION:=1.0.1-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Vaultwarden
--- a/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh
+++ b/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh
@ -37,7 +37,7 @@ do_install() {
    cmd="$cmd -e \"SIGNUPS_ALLOWED=false\""
  fi

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd -v /mnt:/mnt"
--- a/luci-app-webvirtcloud/Makefile
+++ b/luci-app-webvirtcloud/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=0.3.8-20231208
+PKG_VERSION:=0.3.8-20231208-1
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for webvirtcloud
--- a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh
+++ b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh
@ -39,7 +39,7 @@ do_install() {
    --dns=223.5.5.5 "

  if [ -z "$tz" ]; then
-    tz="`uci get system.@system[0].zonename`"
+    tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  fi
  [ -z "$tz" ] || cmd="$cmd -e TZ=\"$tz\""

--- a/luci-app-wxedge/Makefile
+++ b/luci-app-wxedge/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.1.3-20230614
+PKG_VERSION:=1.1.3-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for wxedge
--- a/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh
+++ b/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh
@ -27,7 +27,7 @@ do_install() {
    -v \"$path/containerd:/var/lib/containerd\" \
    -e PLACE=CTKS"

-  local tz="`uci get system.@system[0].zonename`"
+  local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

  cmd="$cmd --name wxedge \"$image_name\""
--- a/luci-app-xteve/Makefile
+++ b/luci-app-xteve/Makefile
@ -2,7 +2,7 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=1.0.2-20230619
+PKG_VERSION:=1.0.2-20231208
 PKG_RELEASE:=

 LUCI_TITLE:=LuCI support for Xteve
--- a/luci-app-xteve/root/usr/libexec/istorec/xteve.sh
+++ b/luci-app-xteve/root/usr/libexec/istorec/xteve.sh
@ -37,7 +37,7 @@ do_install() {
    -p $port:34400 "

  if [ -z "$tz" ]; then
-    tz="`uci get system.@system[0].zonename`"
+    tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
  fi
  [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@ -12,7 +12,7 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>

 include $(INCLUDE_DIR)/package.mk

-GEOIP_VER:=202312070040
+GEOIP_VER:=202312071808
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
  URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
@ -21,13 +21,13 @@ define Download/geoip
  HASH:=1c8d8bd5e8966a115d2ba16739660ef8ea1ebbb812fec4f87c699df479721652
 endef

-GEOSITE_VER:=20231207180922
+GEOSITE_VER:=20231208065009
 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:=7a6cfbb0164fc6ad2b772cbccc6b8f3dea5a0743055228392d5da40f2260305d
+  HASH:=a989634ca9ef02d9f345b9de1c2bacf4a20a4f3227c83c80b896e2795cf32501
 endef

 GEOSITE_IRAN_VER:=202312061428