OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2023-12-08 16:24:00

This commit is contained in:
github-actions[bot] 2023-12-08 16:24:00 +08:00
parent ac8505fc16
commit 11565242c9
54 changed files with 150 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-bmtedge/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20231020 PKG_VERSION:=1.0.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for bmtedge LUCI_TITLE:=LuCI support for bmtedge

2
luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh
View File

@ -37,7 +37,7 @@ do_install() {
-e ksc_net=\"$netdev\" \ -e ksc_net=\"$netdev\" \
-e ksc_machine_code=\"lsyK17032_$uid\" " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd --name bmtedge \"$image_name\"" cmd="$cmd --name bmtedge \"$image_name\""

2
luci-app-chinesesubfinder/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20230215 PKG_VERSION:=1.0.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for ChineseSubFinder LUCI_TITLE:=LuCI support for ChineseSubFinder

2
luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh
View File

@ -29,7 +29,7 @@ do_install() {
--log-driver \"json-file\" \ --log-driver \"json-file\" \
--log-opt \"max-size=100m\" " --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 "$tz" ] || cmd="$cmd -e TZ=$tz"
[ -z "$media" ] || cmd="$cmd -v \"$media:/media\"" [ -z "$media" ] || cmd="$cmd -v \"$media:/media\""

2
luci-app-codeserver/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108 PKG_VERSION:=1.0.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for CodeServer LUCI_TITLE:=LuCI support for CodeServer

2
luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh
View File

@ -31,7 +31,7 @@ do_install() {
-e DEFAULT_WORKSPACE=/config/workspace \ -e DEFAULT_WORKSPACE=/config/workspace \
-p $http_port:8443 " -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 "$tz" ] || cmd="$cmd -e TZ=$tz"
[ -z "$env_password" ] || cmd="$cmd -e \"PASSWORD=$env_password\"" [ -z "$env_password" ] || cmd="$cmd -e \"PASSWORD=$env_password\""

2
luci-app-emby/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.3-20231117 PKG_VERSION:=1.0.3-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Emby LUCI_TITLE:=LuCI support for Emby

2
luci-app-emby/root/usr/libexec/istorec/emby.sh
View File

@ -43,7 +43,7 @@ do_install() {
-p $http_port:8096 " -p $http_port:8096 "
fi 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 "$tz" ] || cmd="$cmd -e TZ=$tz"
[ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/cache\"" [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/cache\""

2
luci-app-gogs/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108 PKG_VERSION:=1.0.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Emby LUCI_TITLE:=LuCI support for Emby

2
luci-app-gogs/root/usr/libexec/istorec/gogs.sh
View File

@ -32,7 +32,7 @@ do_install() {
-p $http_port:3000 \ -p $http_port:3000 \
-p $ssh_port:22 " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-heimdall/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.1-20230108 PKG_VERSION:=1.1.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for heimdall LUCI_TITLE:=LuCI support for heimdall

2
luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
View File

@ -38,7 +38,7 @@ do_install_detail() {
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"
mountpoint -q /mnt && cmd="$cmd:rslave" 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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd --name heimdall \"$IMAGE_NAME\"" cmd="$cmd --name heimdall \"$IMAGE_NAME\""

2
luci-app-homeassistant/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.2-20230312 PKG_VERSION:=1.1.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for homeassistant LUCI_TITLE:=LuCI support for homeassistant

2
luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh
View File

@ -24,7 +24,7 @@ do_install() {
--dns=127.0.0.1 " --dns=127.0.0.1 "
if [ -z "$tz" ]; then if [ -z "$tz" ]; then
tz="`uci get system.@system[0].zonename`" tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
fi fi
[ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

2
luci-app-jackett/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.1-20230108 PKG_VERSION:=1.1.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for jackett LUCI_TITLE:=LuCI support for jackett

2
luci-app-jackett/root/usr/libexec/istorec/jackett.sh
View File

@ -32,7 +32,7 @@ do_install() {
--dns=172.17.0.1 \ --dns=172.17.0.1 \
-p $port:9117 " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
if [ -n "$auto_update" ]; then if [ -n "$auto_update" ]; then

2
luci-app-jellyfin/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.8-20230619 PKG_VERSION:=1.1.8-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for jellyfin LUCI_TITLE:=LuCI support for jellyfin

2
luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua
View File

@ -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>' .. 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>" .. "<dl><dt>" .. translate("The following models support hardware transcoding without configuration in Jellyfin:") .. "</dt>"
.. "<dd>- Easepi ARS2</dd>" .. "<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>" .. "<dt>" .. translate("The following models may support hardware transcoding by referring to the official Jellyfin documentation:") .. "</dt>"
.. "<dd>- " .. translate("x86 series") .. "</dd>" .. "<dd>- " .. translate("x86 series") .. "</dd>"
.. "<dd>- " .. translate("Raspberry Pi series") .. "</dd>" .. "<dd>- " .. translate("Raspberry Pi series") .. "</dd>"

4
luci-app-jellyfin/po/zh-cn/jellyfin.po
View File

@ -10,8 +10,8 @@ msgstr "Jellyfin 是志愿者构建的媒体解决方案，可让您控制自己
msgid "The following models support hardware transcoding without configuration in Jellyfin:" msgid "The following models support hardware transcoding without configuration in Jellyfin:"
msgstr "以下机型无需在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." 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 "RK3568 系列（例如R5S，R68s，R66s等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。" 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:" msgid "The following models may support hardware transcoding by referring to the official Jellyfin documentation:"
msgstr "以下机型参考 Jellyfin 官方文档配置可能支持硬件转码：" msgstr "以下机型参考 Jellyfin 官方文档配置可能支持硬件转码："

6
luci-app-jellyfin/root/etc/config/jellyfin
View File

@ -2,6 +2,6 @@ config jellyfin
option 'hostnet' '0' option 'hostnet' '0'
option 'port' '8096' option 'port' '8096'
option 'image' 'default' option 'image' 'default'
option 'media_path' '' # option 'media_path' ''
option 'config_path' '' # option 'config_path' ''
option 'cache_path' '' # option 'cache_path' ''

2
luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh
View File

@ -100,7 +100,7 @@ do_install_detail() {
-p $port:8096 " -p $port:8096 "
fi 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 "$tz" ] || cmd="$cmd -e TZ=$tz"
[ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\"" [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\""

2
luci-app-lanraragi/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108 PKG_VERSION:=1.0.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for LANraragi LUCI_TITLE:=LuCI support for LANraragi

2
luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh
View File

@ -28,7 +28,7 @@ do_install() {
--dns=172.17.0.1 \ --dns=172.17.0.1 \
-p $http_port:3000 " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-memos/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20230412 PKG_VERSION:=1.0.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Memos LUCI_TITLE:=LuCI support for Memos

2
luci-app-memos/root/usr/libexec/istorec/memos.sh
View File

@ -27,7 +27,7 @@ do_install() {
--dns=172.17.0.1 \ --dns=172.17.0.1 \
-p $http_port:5230 " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-nastools/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.3-20230215 PKG_VERSION:=1.1.3-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for nastools LUCI_TITLE:=LuCI support for nastools

2
luci-app-nastools/root/usr/libexec/istorec/nastools.sh
View File

@ -32,7 +32,7 @@ do_install() {
-p $port:3000 \ -p $port:3000 \
-e UMASK=000" -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
if [ -n "$auto_update" ]; then if [ -n "$auto_update" ]; then

2
luci-app-navidrome/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108 PKG_VERSION:=1.0.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Navidrome LUCI_TITLE:=LuCI support for Navidrome

2
luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh
View File

@ -28,7 +28,7 @@ do_install() {
--dns=172.17.0.1 \ --dns=172.17.0.1 \
-p $http_port:4533 " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-nextcloud/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.1-20230108 PKG_VERSION:=1.1.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for nextcloud LUCI_TITLE:=LuCI support for nextcloud

2
luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh
View File

@ -38,7 +38,7 @@ do_install() {
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"
mountpoint -q /mnt && cmd="$cmd:rslave" 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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd --name nextcloud \"$IMAGE_NAME\"" cmd="$cmd --name nextcloud \"$IMAGE_NAME\""

2
luci-app-owntone/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20230619 PKG_VERSION:=1.0.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Owntone LUCI_TITLE:=LuCI support for Owntone

2
luci-app-owntone/root/usr/libexec/istorec/owntone.sh
View File

@ -25,7 +25,7 @@ do_install() {
--dns=127.0.0.1 \ --dns=127.0.0.1 \
--network=host " --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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-passwall2/Makefile
View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.21-3 PKG_VERSION:=1.21-4
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

28
luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/sing-box.lua
View File

@ -438,6 +438,7 @@ o = s:option(ListValue, option_name("transport"), translate("Transport"))
o:value("tcp", "TCP") o:value("tcp", "TCP")
o:value("http", "HTTP") o:value("http", "HTTP")
o:value("ws", "WebSocket") o:value("ws", "WebSocket")
o:value("httpupgrade", "HTTPUpgrade")
if singbox_tags:find("with_quic") then if singbox_tags:find("with_quic") then
o:value("quic", "QUIC") o:value("quic", "QUIC")
end 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 = 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 }) 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部分 ]]-- -- [[ gRPC部分 ]]--
o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") o = s:option(Value, option_name("grpc_serviceName"), "ServiceName")
o:depends({ [option_name("transport")] = "grpc" }) o:depends({ [option_name("transport")] = "grpc" })
@ -533,8 +542,6 @@ o = s:option(Flag, option_name("mux"), translate("Mux"))
o.rmempty = false o.rmempty = false
o:depends({ [option_name("protocol")] = "vmess" }) o:depends({ [option_name("protocol")] = "vmess" })
o:depends({ [option_name("protocol")] = "vless", [option_name("flow")] = "" }) 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")] = "shadowsocks", [option_name("uot")] = "" })
o:depends({ [option_name("protocol")] = "trojan" }) o:depends({ [option_name("protocol")] = "trojan" })
@ -545,13 +552,26 @@ o:value("h2mux")
o:depends({ [option_name("mux")] = true }) o:depends({ [option_name("mux")] = true })
o = s:option(Value, option_name("mux_concurrency"), translate("Mux concurrency")) o = s:option(Value, option_name("mux_concurrency"), translate("Mux concurrency"))
o.default = 8 o.default = 4
o:depends({ [option_name("mux")] = true }) o:depends({ [option_name("mux")] = true, [option_name("tcpbrutal")] = false })
o = s:option(Flag, option_name("mux_padding"), translate("Padding")) o = s:option(Flag, option_name("mux_padding"), translate("Padding"))
o.default = 0 o.default = 0
o:depends({ [option_name("mux")] = true }) 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 = s:option(Flag, option_name("shadowtls"), "ShadowTLS")
o.default = 0 o.default = 0
o:depends({ [option_name("protocol")] = "vmess", [option_name("tls")] = false }) o:depends({ [option_name("protocol")] = "vmess", [option_name("tls")] = false })

30
luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/sing-box.lua
View File

@ -310,6 +310,7 @@ o = s:option(ListValue, option_name("transport"), translate("Transport"))
o:value("tcp", "TCP") o:value("tcp", "TCP")
o:value("http", "HTTP") o:value("http", "HTTP")
o:value("ws", "WebSocket") o:value("ws", "WebSocket")
o:value("httpupgrade", "HTTPUpgrade")
o:value("quic", "QUIC") o:value("quic", "QUIC")
o:value("grpc", "gRPC") o:value("grpc", "gRPC")
o:depends({ [option_name("protocol")] = "shadowsocks" }) 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 = s:option(Value, option_name("ws_path"), translate("WebSocket Path"))
o:depends({ [option_name("transport")] = "ws" }) 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部分 ]]-- -- [[ gRPC部分 ]]--
o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") o = s:option(Value, option_name("grpc_serviceName"), "ServiceName")
o:depends({ [option_name("transport")] = "grpc" }) 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 = 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" o.default = "0"

42
luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
View File

@ -117,10 +117,28 @@ function gen_outbound(flag, node, tag, proxy_table)
mux = { mux = {
enabled = true, enabled = true,
protocol = node.mux_type or "h2mux", protocol = node.mux_type or "h2mux",
max_connections = tonumber(node.mux_concurrency) or 4, max_connections = ( (node.tcpbrutal == "1") and 1 ) or tonumber(node.mux_concurrency) or 4,
padding = (node.mux_padding == "1") and true or false padding = (node.mux_padding == "1") and true or false,
--min_streams = 4, --min_streams = 4,
--max_streams = 0, --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 end
@ -147,6 +165,14 @@ function gen_outbound(flag, node, tag, proxy_table)
} }
end 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 if node.transport == "quic" then
v2ray_transport = { v2ray_transport = {
type = "quic" type = "quic"
@ -422,6 +448,14 @@ function gen_config_server(node)
} }
end 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 if node.transport == "quic" then
v2ray_transport = { v2ray_transport = {
type = "quic" type = "quic"
@ -484,6 +518,7 @@ function gen_config_server(node)
protocol_table = { protocol_table = {
method = node.method, method = node.method,
password = node.password, password = node.password,
multiplex = mux,
} }
end end
@ -500,6 +535,7 @@ function gen_config_server(node)
protocol_table = { protocol_table = {
users = users, users = users,
tls = (node.tls == "1") and tls or nil, tls = (node.tls == "1") and tls or nil,
multiplex = mux,
transport = v2ray_transport, transport = v2ray_transport,
} }
end end
@ -518,6 +554,7 @@ function gen_config_server(node)
protocol_table = { protocol_table = {
users = users, users = users,
tls = (node.tls == "1") and tls or nil, tls = (node.tls == "1") and tls or nil,
multiplex = mux,
transport = v2ray_transport, transport = v2ray_transport,
} }
end end
@ -537,6 +574,7 @@ function gen_config_server(node)
tls = (node.tls == "1") and tls or nil, tls = (node.tls == "1") and tls or nil,
fallback = nil, fallback = nil,
fallback_for_alpn = nil, fallback_for_alpn = nil,
multiplex = mux,
transport = v2ray_transport, transport = v2ray_transport,
} }
end end

2
luci-app-photoprism/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.3-20230804 PKG_VERSION:=1.0.3-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for PhotoPrism LUCI_TITLE:=LuCI support for PhotoPrism

2
luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh
View File

@ -27,7 +27,7 @@ do_install() {
-e PHOTOPRISM_UPLOAD_NSFW=\"true\" \ -e PHOTOPRISM_UPLOAD_NSFW=\"true\" \
-e PHOTOPRISM_ADMIN_PASSWORD=\"$password\" " -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 "$tz" ] || cmd="$cmd -e TZ=$tz"
[ -z "$picture" ] || cmd="$cmd -v \"$picture:/photoprism/originals\"" [ -z "$picture" ] || cmd="$cmd -v \"$picture:/photoprism/originals\""

2
luci-app-plex/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20230619 PKG_VERSION:=1.0.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Plex LUCI_TITLE:=LuCI support for Plex

2
luci-app-plex/root/usr/libexec/istorec/plex.sh
View File

@ -54,7 +54,7 @@ do_install() {
-p $port:32400 " -p $port:32400 "
fi 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 "$tz" ] || cmd="$cmd -e TZ=$tz"
[ -z "$claim_token" ] || cmd="$cmd -e \"PLEX_CLAIM=$claim_token\"" [ -z "$claim_token" ] || cmd="$cmd -e \"PLEX_CLAIM=$claim_token\""

2
luci-app-ubuntu/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.1-20230108 PKG_VERSION:=1.1.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for ubuntu LUCI_TITLE:=LuCI support for ubuntu

2
luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh
View File

@ -44,7 +44,7 @@ do_install() {
-e VNC_PW=${password} \ -e VNC_PW=${password} \
-e VNC_USE_HTTP=0 " -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-unifi/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20230619 PKG_VERSION:=1.0.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for UnifiController LUCI_TITLE:=LuCI support for UnifiController

2
luci-app-unifi/root/usr/libexec/istorec/unifi.sh
View File

@ -37,7 +37,7 @@ do_install() {
-p $http_port:8443 " -p $http_port:8443 "
fi 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 "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-vaultwarden/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230108 PKG_VERSION:=1.0.1-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Vaultwarden LUCI_TITLE:=LuCI support for Vaultwarden

2
luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh
View File

@ -37,7 +37,7 @@ do_install() {
cmd="$cmd -e \"SIGNUPS_ALLOWED=false\"" cmd="$cmd -e \"SIGNUPS_ALLOWED=false\""
fi 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 "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt" cmd="$cmd -v /mnt:/mnt"

2
luci-app-webvirtcloud/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=0.3.8-20231208 PKG_VERSION:=0.3.8-20231208-1
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for webvirtcloud LUCI_TITLE:=LuCI support for webvirtcloud

2
luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh
View File

@ -39,7 +39,7 @@ do_install() {
--dns=223.5.5.5 " --dns=223.5.5.5 "
if [ -z "$tz" ]; then if [ -z "$tz" ]; then
tz="`uci get system.@system[0].zonename`" tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
fi fi
[ -z "$tz" ] || cmd="$cmd -e TZ=\"$tz\"" [ -z "$tz" ] || cmd="$cmd -e TZ=\"$tz\""

2
luci-app-wxedge/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.3-20230614 PKG_VERSION:=1.1.3-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for wxedge LUCI_TITLE:=LuCI support for wxedge

2
luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh
View File

@ -27,7 +27,7 @@ do_install() {
-v \"$path/containerd:/var/lib/containerd\" \ -v \"$path/containerd:/var/lib/containerd\" \
-e PLACE=CTKS" -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" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd --name wxedge \"$image_name\"" cmd="$cmd --name wxedge \"$image_name\""

2
luci-app-xteve/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20230619 PKG_VERSION:=1.0.2-20231208
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for Xteve LUCI_TITLE:=LuCI support for Xteve

2
luci-app-xteve/root/usr/libexec/istorec/xteve.sh
View File

@ -37,7 +37,7 @@ do_install() {
-p $port:34400 " -p $port:34400 "
if [ -z "$tz" ]; then if [ -z "$tz" ]; then
tz="`uci get system.@system[0].zonename`" tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
fi fi
[ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"

6
v2ray-geodata/Makefile
View File

@ -12,7 +12,7 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
GEOIP_VER:=202312070040 GEOIP_VER:=202312071808
GEOIP_FILE:=geoip.dat.$(GEOIP_VER) GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
@ -21,13 +21,13 @@ define Download/geoip
HASH:=1c8d8bd5e8966a115d2ba16739660ef8ea1ebbb812fec4f87c699df479721652 HASH:=1c8d8bd5e8966a115d2ba16739660ef8ea1ebbb812fec4f87c699df479721652
endef endef
GEOSITE_VER:=20231207180922 GEOSITE_VER:=20231208065009
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE) FILE:=$(GEOSITE_FILE)
HASH:=7a6cfbb0164fc6ad2b772cbccc6b8f3dea5a0743055228392d5da40f2260305d HASH:=a989634ca9ef02d9f345b9de1c2bacf4a20a4f3227c83c80b896e2795cf32501
endef endef
GEOSITE_IRAN_VER:=202312061428 GEOSITE_IRAN_VER:=202312061428