mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-10-05 09:36:37 +08:00
feat(backend): TLS tunnel relay nodelay injection
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
@@ -916,14 +916,19 @@ func (h *Handler) federationRuntimeApplyRole(w http.ResponseWriter, r *http.Requ
|
|||||||
response.WriteJSON(w, response.ErrDefault("Invalid target"))
|
response.WriteJSON(w, response.ErrDefault("Invalid target"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
targetProtocol := defaultString(target.Protocol, protocol)
|
||||||
|
connector := map[string]interface{}{
|
||||||
|
"type": "relay",
|
||||||
|
}
|
||||||
|
if isTLSTunnelProtocol(targetProtocol) {
|
||||||
|
connector["metadata"] = map[string]interface{}{"nodelay": true}
|
||||||
|
}
|
||||||
nodeItems = append(nodeItems, map[string]interface{}{
|
nodeItems = append(nodeItems, map[string]interface{}{
|
||||||
"name": fmt.Sprintf("node_%d", i+1),
|
"name": fmt.Sprintf("node_%d", i+1),
|
||||||
"addr": processServerAddress(fmt.Sprintf("%s:%d", host, target.Port)),
|
"addr": processServerAddress(fmt.Sprintf("%s:%d", host, target.Port)),
|
||||||
"connector": map[string]interface{}{
|
"connector": connector,
|
||||||
"type": "relay",
|
|
||||||
},
|
|
||||||
"dialer": map[string]interface{}{
|
"dialer": map[string]interface{}{
|
||||||
"type": defaultString(target.Protocol, protocol),
|
"type": targetProtocol,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -962,6 +967,9 @@ func (h *Handler) federationRuntimeApplyRole(w http.ResponseWriter, r *http.Requ
|
|||||||
"type": protocol,
|
"type": protocol,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
if isTLSTunnelProtocol(protocol) {
|
||||||
|
service["handler"].(map[string]interface{})["metadata"] = map[string]interface{}{"nodelay": true}
|
||||||
|
}
|
||||||
if req.Role == "middle" {
|
if req.Role == "middle" {
|
||||||
service["handler"].(map[string]interface{})["chain"] = chainName
|
service["handler"].(map[string]interface{})["chain"] = chainName
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2564,14 +2564,19 @@ func buildTunnelChainConfig(tunnelID int64, fromNodeID int64, targets []tunnelRu
|
|||||||
if port <= 0 {
|
if port <= 0 {
|
||||||
return nil, errors.New("节点端口不能为空")
|
return nil, errors.New("节点端口不能为空")
|
||||||
}
|
}
|
||||||
|
protocol := defaultString(target.Protocol, "tls")
|
||||||
|
connector := map[string]interface{}{
|
||||||
|
"type": "relay",
|
||||||
|
}
|
||||||
|
if isTLSTunnelProtocol(protocol) {
|
||||||
|
connector["metadata"] = map[string]interface{}{"nodelay": true}
|
||||||
|
}
|
||||||
nodeItems = append(nodeItems, map[string]interface{}{
|
nodeItems = append(nodeItems, map[string]interface{}{
|
||||||
"name": fmt.Sprintf("node_%d", idx+1),
|
"name": fmt.Sprintf("node_%d", idx+1),
|
||||||
"addr": processServerAddress(fmt.Sprintf("%s:%d", host, port)),
|
"addr": processServerAddress(fmt.Sprintf("%s:%d", host, port)),
|
||||||
"connector": map[string]interface{}{
|
"connector": connector,
|
||||||
"type": "relay",
|
|
||||||
},
|
|
||||||
"dialer": map[string]interface{}{
|
"dialer": map[string]interface{}{
|
||||||
"type": defaultString(target.Protocol, "tls"),
|
"type": protocol,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -2600,14 +2605,19 @@ func buildTunnelChainServiceConfig(tunnelID int64, chainNode tunnelRuntimeNode,
|
|||||||
if node == nil {
|
if node == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
protocol := defaultString(chainNode.Protocol, "tls")
|
||||||
|
handlerCfg := map[string]interface{}{
|
||||||
|
"type": "relay",
|
||||||
|
}
|
||||||
|
if isTLSTunnelProtocol(protocol) {
|
||||||
|
handlerCfg["metadata"] = map[string]interface{}{"nodelay": true}
|
||||||
|
}
|
||||||
service := map[string]interface{}{
|
service := map[string]interface{}{
|
||||||
"name": fmt.Sprintf("%d_tls", tunnelID),
|
"name": fmt.Sprintf("%d_tls", tunnelID),
|
||||||
"addr": fmt.Sprintf("%s:%d", node.TCPListenAddr, chainNode.Port),
|
"addr": fmt.Sprintf("%s:%d", node.TCPListenAddr, chainNode.Port),
|
||||||
"handler": map[string]interface{}{
|
"handler": handlerCfg,
|
||||||
"type": "relay",
|
|
||||||
},
|
|
||||||
"listener": map[string]interface{}{
|
"listener": map[string]interface{}{
|
||||||
"type": defaultString(chainNode.Protocol, "tls"),
|
"type": protocol,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
if chainNode.ChainType == 2 {
|
if chainNode.ChainType == 2 {
|
||||||
@@ -2653,6 +2663,10 @@ func nodeDisplayName(node *nodeRecord) string {
|
|||||||
return fmt.Sprintf("node_%d", node.ID)
|
return fmt.Sprintf("node_%d", node.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isTLSTunnelProtocol(protocol string) bool {
|
||||||
|
return strings.EqualFold(strings.TrimSpace(defaultString(protocol, "tls")), "tls")
|
||||||
|
}
|
||||||
|
|
||||||
func nodeSupportsV4(node *nodeRecord) bool {
|
func nodeSupportsV4(node *nodeRecord) bool {
|
||||||
if node == nil {
|
if node == nil {
|
||||||
return false
|
return false
|
||||||
|
|||||||
Reference in New Issue
Block a user