fix can't start other nodes if tuic-node is enabled

hysteria/Makefile

@@ -30,6 +30,7 @@ include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 define Package/hysteria
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
   TITLE:=A feature-packed network utility optimized for networks of poor quality
   URL:=https://github.com/apernet/hysteria
   DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle

luci-app-ssr-plus/Makefile

@@ -61,58 +61,58 @@ define Package/$(PKG_NAME)/config
 select PACKAGE_luci-lib-ipkg if PACKAGE_$(PKG_NAME)
 
 choice
-	prompt "Shadowsocks Client Selection"
-	default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client if aarch64
-	default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
+        prompt "Shadowsocks Client Selection"
+        default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client if aarch64
+        default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_NONE_Client
-	bool "None"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_NONE_Client
+        bool "None"
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
-	bool "Shadowsocks-libev"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
+        bool "Shadowsocks-libev"
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
-	bool "Shadowsocks-rust"
-	depends on aarch64||arm||i386||mips||mipsel||x86_64
-	depends on !(TARGET_x86_geode||TARGET_x86_legacy)
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
+        bool "Shadowsocks-rust"
+        depends on aarch64||arm||i386||mips||mipsel||x86_64
+        depends on !(TARGET_x86_geode||TARGET_x86_legacy)
 endchoice
 
 choice
-	prompt "Shadowsocks Server Selection"
-	default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server if aarch64
-	default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server if i386||x86_64||arm
-	default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_NONE_Server
+        prompt "Shadowsocks Server Selection"
+        default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server if aarch64
+        default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server if i386||x86_64||arm
+        default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_NONE_Server
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_NONE_Server
-	bool "None"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_NONE_Server
+        bool "None"
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
-	bool "Shadowsocks-libev"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
+        bool "Shadowsocks-libev"
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
-	bool "Shadowsocks-rust"
-	depends on aarch64||arm||i386||mips||mipsel||x86_64
-	depends on !(TARGET_x86_geode||TARGET_x86_legacy)
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
+        bool "Shadowsocks-rust"
+        depends on aarch64||arm||i386||mips||mipsel||x86_64
+        depends on !(TARGET_x86_geode||TARGET_x86_legacy)
 endchoice
 
 choice
-	prompt "V2ray-core Selection"
-	default PACKAGE_$(PKG_NAME)_INCLUDE_Xray if aarch64||arm||i386||x86_64
-	default PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY
+        prompt "V2ray-core Selection"
+        default PACKAGE_$(PKG_NAME)_INCLUDE_Xray if aarch64||arm||i386||x86_64
+        default PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY
-	bool "None"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY
+        bool "None"
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
-	bool "V2ray-core"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
+        bool "V2ray-core"
 
-	config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
-	bool "Xray-core"
+        config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
+        bool "Xray-core"
 endchoice
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
-	bool "Include ChinaDNS-NG"
-	default y
+        bool "Include ChinaDNS-NG"
+        default y
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
 	bool "Include Hysteria"
@@ -128,42 +128,42 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_TUIC-Client
 	default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks
-	bool "Include IPT2Socks"
-	default n
+        bool "Include IPT2Socks"
+        default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
-	bool "Include Kcptun"
-	default n
+        bool "Include Kcptun"
+        default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
-	bool "Include NaiveProxy"
-	depends on !(arc||armeb||mips||mips64||powerpc||TARGET_gemini)
-	default n
+        bool "Include NaiveProxy"
+        depends on !(arc||armeb||mips||mips64||powerpc||TARGET_gemini)
+        default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2
-	bool "Include Redsocks2"
-	default n
+        bool "Include Redsocks2"
+        default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Simple_Obfs
-	bool "Include Shadowsocks Simple Obfs Plugin"
-	default y
+        bool "Include Shadowsocks Simple Obfs Plugin"
+        default y
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_V2ray_Plugin
-	bool "Include Shadowsocks V2ray Plugin"
-	default n
+        bool "Include Shadowsocks V2ray Plugin"
+        default n
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
-	bool "Include ShadowsocksR Libev Client"
-	default y
+        bool "Include ShadowsocksR Libev Client"
+        default y
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
-	bool "Include ShadowsocksR Libev Server"
-	default y if i386||x86_64||arm
+        bool "Include ShadowsocksR Libev Server"
+        default y if i386||x86_64||arm
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan
-	bool "Include Trojan"
-	select PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks
-	default n
+        bool "Include Trojan"
+        select PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks
+        default n
 endef
 
 define Package/$(PKG_NAME)/conffiles

luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua

@@ -383,28 +383,24 @@ o:value("new_reno", translate("New Reno"))
 o.default = "cubic"
 o.rmempty = true
 
-o = s:option(Value, "heartbeat", translate("Heartbeat interval(second)"))
+o = s:option(Value, "heartbeat_interval", translate("Heartbeat interval(second)"))
 o:depends("type", "tuic")
-o.datatype = "uinteger"
-o.default = "3"
+o.default = "3s"
 o.rmempty = true
 
 o = s:option(Value, "timeout", translate("Timeout for establishing a connection to server(second)"))
 o:depends("type", "tuic")
-o.datatype = "uinteger"
-o.default = "8"
+o.default = "8s"
 o.rmempty = true
 
 o = s:option(Value, "gc_interval", translate("Garbage collection interval(second)"))
 o:depends("type", "tuic")
-o.datatype = "uinteger"
-o.default = "3"
+o.default = "3s"
 o.rmempty = true
 
 o = s:option(Value, "gc_lifetime", translate("Garbage collection lifetime(second)"))
 o:depends("type", "tuic")
-o.datatype = "uinteger"
-o.default = "15"
+o.default = "15s"
 o.rmempty = true
 
 o = s:option(Value, "send_window", translate("TUIC send window"))
@@ -889,5 +885,4 @@ if is_finded("kcptun-client") then
 	o:depends("type", "ssr")
 	o:depends("type", "ss")
 end
-
 return m

luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua

@@ -314,19 +314,19 @@ local tuic = {
 				certificates = server.certificate and { server.certpath } or nil,
 				udp_relay_mode = server.udp_relay_mode,
 				congestion_control = server.congestion_control,
-				heartbeat = server.heartbeat,
-				timeout = server.timeout,
-				gc_interval = server.gc_interval,
-				gc_lifetime = server.gc_lifetime,
+				heartbeat = server.heartbeat and server.heartbeat .. "s" or nil,
+				timeout = server.timeout and server.timeout  .. "s" or nil,
+				gc_interval = server.gc_interval and server.gc_interval  .. "s" or nil,
+				gc_lifetime = server.gc_lifetime and server.gc_lifetime .. "s" or nil,
 				alpn = server.tls_alpn,
-				disable_sni = (server.disable_sni == "1"),
-				zero_rtt_handshake = (server.zero_rtt_handshake == "1"),
+				disable_sni = (server.disable_sni == "1") and true or false,
+				zero_rtt_handshake = (server.zero_rtt_handshake == "1") and true or false,
 				send_window = tonumber(server.send_window),
 				receive_window = tonumber(server.receive_window)
         },
 		["local"] = {
-				server = "[::]:" .. tonumber(local_port),
-				dual_stack = (server.tuic_dual_stack == "1") and true or false,
+				server = "0.0.0.0:" .. tonumber(local_port),
+				--dual_stack = (server.tuic_dual_stack == "1") and true or false,
 				max_packet_size = server.tuic_max_package_size
 		}
 }