mirror of
https://github.com/sipeed/picoclaw.git
synced 2026-06-12 18:08:54 +00:00
Liu Yuan
11207186c8
- Modify buildWsURL to use web server port (18800) instead of gateway port (18790) - Add WebSocket proxy handler to forward /pico/ws to gateway - Gateway port is read from config (cfg.Gateway.Port), defaults to 18790 - This allows WebSocket connections through the same port as the web UI, avoiding the need to expose extra ports for Tailscale/Docker
91 lines
1.9 KiB
Go
91 lines
1.9 KiB
Go
package api
|
|
|
|
import (
|
|
"net"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/sipeed/picoclaw/pkg/config"
|
|
)
|
|
|
|
func (h *Handler) effectiveLauncherPublic() bool {
|
|
if h.serverPublicExplicit {
|
|
return h.serverPublic
|
|
}
|
|
|
|
cfg, err := h.loadLauncherConfig()
|
|
if err == nil {
|
|
return cfg.Public
|
|
}
|
|
|
|
return h.serverPublic
|
|
}
|
|
|
|
func (h *Handler) gatewayHostOverride() string {
|
|
if h.effectiveLauncherPublic() {
|
|
return "0.0.0.0"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func (h *Handler) effectiveGatewayBindHost(cfg *config.Config) string {
|
|
if override := h.gatewayHostOverride(); override != "" {
|
|
return override
|
|
}
|
|
if cfg == nil {
|
|
return ""
|
|
}
|
|
return strings.TrimSpace(cfg.Gateway.Host)
|
|
}
|
|
|
|
func gatewayProbeHost(bindHost string) string {
|
|
if bindHost == "" || bindHost == "0.0.0.0" {
|
|
return "127.0.0.1"
|
|
}
|
|
return bindHost
|
|
}
|
|
|
|
func requestHostName(r *http.Request) string {
|
|
reqHost, _, err := net.SplitHostPort(r.Host)
|
|
if err == nil {
|
|
return reqHost
|
|
}
|
|
if strings.TrimSpace(r.Host) != "" {
|
|
return r.Host
|
|
}
|
|
return "127.0.0.1"
|
|
}
|
|
|
|
func requestWSScheme(r *http.Request) string {
|
|
if forwarded := strings.TrimSpace(r.Header.Get("X-Forwarded-Proto")); forwarded != "" {
|
|
proto := strings.ToLower(strings.TrimSpace(strings.Split(forwarded, ",")[0]))
|
|
if proto == "https" || proto == "wss" {
|
|
return "wss"
|
|
}
|
|
if proto == "http" || proto == "ws" {
|
|
return "ws"
|
|
}
|
|
}
|
|
|
|
if r.TLS != nil {
|
|
return "wss"
|
|
}
|
|
|
|
return "ws"
|
|
}
|
|
|
|
func (h *Handler) buildWsURL(r *http.Request, cfg *config.Config) string {
|
|
host := h.effectiveGatewayBindHost(cfg)
|
|
if host == "" || host == "0.0.0.0" {
|
|
host = requestHostName(r)
|
|
}
|
|
// Use web server port instead of gateway port to avoid exposing extra ports
|
|
// The WebSocket connection will be proxied by the backend to the gateway
|
|
wsPort := h.serverPort
|
|
if wsPort == 0 {
|
|
wsPort = 18800 // default web server port
|
|
}
|
|
return requestWSScheme(r) + "://" + net.JoinHostPort(host, strconv.Itoa(wsPort)) + "/pico/ws"
|
|
}
|