Merge pull request #1885 from yuexps/main

feat(server/gui): add Unix Domain Socket and BaseUrl support for FnOS & reverse proxies
This commit is contained in:
Markson Hon authored and GitHub committed 2026-06-28 21:30:49 +08:00
commit 4e366494a3
5 files changed
+74 -21

No files matched your search

+5 -2
View File
@@ -285,8 +285,11 @@ export default {
if (u.protocol === "https") {
protocol = "wss";
}
url = `${protocol}://${u.host}:${u.port
}/api/message?Authorization=${encodeURIComponent(localStorage["token"])}`;
let basePath = u.path;
if (basePath.endsWith("/api")) {
basePath = basePath.slice(0, -4);
}
url = `${protocol}://${u.host}:${u.port}${basePath}/api/message?Authorization=${encodeURIComponent(localStorage["token"])}`;
if (this.ws) {
// console.log("ws close");
this.ws.close();
+1 -1
View File
@@ -14,7 +14,7 @@
ref="backendAddress"
v-model="table.backendAddress"
placeholder="http://localhost:2017"
pattern="https?://.+(:\d+)?"
pattern="(|https?://.+|/.+)"
>
>
</b-input>
+14 -8
View File
@@ -1,12 +1,18 @@
// import { parseURL, isIntranet } from "@/assets/js/utils";
console.log("backendPort");
let ba = localStorage.getItem("backendAddress");
if (ba == null) {
// const u = parseURL(location.href);
// if (u.host !== "localhost" && u.host !== "local" && isIntranet(u.host)) {
// localStorage["backendAddress"] = `${u.protocol}://${u.host}:2017`;
// } else {
// localStorage.setItem("backendAddress", "http://localhost:2017");
// }
localStorage.setItem("backendAddress", "");
let currentPrefix = "";
if (typeof window !== "undefined") {
let path = window.location.pathname;
const match = path.match(/^(.*)\/(?:login|setting|log|server|rule|running)?\/?$/);
if (match) {
currentPrefix = match[1];
}
}
if (currentPrefix && currentPrefix !== "/") {
localStorage.setItem("backendAddress", currentPrefix);
} else {
if (ba == null) {
localStorage.setItem("backendAddress", "");
}
}
+12
View File
@@ -15,6 +15,8 @@ import (
type Params struct {
Address string `id:"address" short:"a" default:"0.0.0.0:2017" desc:"Listening address"`
Socket string `id:"socket" desc:"Unix socket path for listening"`
BaseUrl string `id:"baseurl" default:"/" desc:"Base URL path prefix"`
V2rayBin string `id:"v2ray-bin" short:"b" desc:"Executable v2ray binary path. Auto-detect if put it empty."`
CoreType string `id:"core-type" desc:"Specify core type: v2ray or xray. Required when using custom v2ray-bin path."`
Config string `id:"config" short:"c" desc:"v2rayA configuration directory"`
@@ -57,6 +59,16 @@ func initFunc() {
log2.Fatal(err)
}
}
if params.BaseUrl == "" {
params.BaseUrl = "/"
} else {
if !strings.HasPrefix(params.BaseUrl, "/") {
params.BaseUrl = "/" + params.BaseUrl
}
if params.BaseUrl != "/" {
params.BaseUrl = strings.TrimSuffix(params.BaseUrl, "/")
}
}
if params.ShowVersion {
fmt.Println(Version)
os.Exit(0)
+42 -10
View File
@@ -93,7 +93,18 @@ func safeStatigzHandler(fsys fs.FS) (http.Handler, bool) {
return handler, true
}
func registerEmbeddedRoute(r *gin.Engine, routePrefix string, fsCandidates ...fs.FS) bool {
func registerEmbeddedRoute(r gin.IRoutes, routePrefix string, fsCandidates ...fs.FS) bool {
prefix := ""
if group, ok := r.(*gin.RouterGroup); ok {
prefix = group.BasePath()
} else if engine, ok := r.(*gin.Engine); ok {
prefix = engine.BasePath()
}
staticPrefix := filepath.ToSlash(filepath.Join(prefix, routePrefix))
if !strings.HasPrefix(staticPrefix, "/") {
staticPrefix = "/" + staticPrefix
}
for _, candidate := range fsCandidates {
if candidate == nil {
continue
@@ -104,7 +115,7 @@ func registerEmbeddedRoute(r *gin.Engine, routePrefix string, fsCandidates ...fs
continue
}
stripped := http.StripPrefix(routePrefix, handler)
stripped := http.StripPrefix(staticPrefix, handler)
r.GET(routePrefix+"/*w", func(c *gin.Context) {
stripped.ServeHTTP(c.Writer, c.Request)
})
@@ -114,7 +125,7 @@ func registerEmbeddedRoute(r *gin.Engine, routePrefix string, fsCandidates ...fs
return false
}
func ServeGUI(r *gin.Engine) {
func ServeGUI(r gin.IRoutes) {
webDir := conf.GetEnvironmentConfig().WebDir
if webDir == "" {
webFS, err := fs.Sub(webRoot, "web")
@@ -192,6 +203,11 @@ func ServeGUI(r *gin.Engine) {
app := conf.GetEnvironmentConfig()
if app.Socket != "" {
log.Alert("v2rayA is listening at unix:%v", app.Socket)
return
}
ip, port, _ := net.SplitHostPort(app.Address)
addrs, err := net.InterfaceAddrs()
if net.ParseIP(ip).IsUnspecified() && err == nil {
@@ -225,7 +241,9 @@ func Run() error {
corsConfig.AddAllowHeaders("Authorization", common.RequestIdHeader)
corsConfig.AddExposeHeaders("Content-Disposition")
engine.Use(cors.New(corsConfig))
noAuth := engine.Group("api",
app := conf.GetEnvironmentConfig()
root := engine.Group(app.BaseUrl)
noAuth := root.Group("api",
nocache,
reqCache.ReqCache,
)
@@ -235,7 +253,7 @@ func Run() error {
noAuth.GET("account", controller.GetAccount)
noAuth.POST("account", controller.PostAccount)
}
auth := engine.Group("api",
auth := root.Group("api",
nocache,
func(ctx *gin.Context) {
if !configure.HasAnyAccounts() {
@@ -292,14 +310,28 @@ func Run() error {
auth.GET("networkInterfaces", controller.GetNetworkInterfaces)
}
ServeGUI(engine)
ServeGUI(root)
addr := conf.GetEnvironmentConfig().Address
l, err := net.Listen("tcp", addr)
if err != nil {
return fmt.Errorf("router: failed to listen on %v: %w", addr, err)
var l net.Listener
var err error
if app.Socket != "" {
_ = os.Remove(app.Socket)
l, err = net.Listen("unix", app.Socket)
if err != nil {
return fmt.Errorf("router: failed to listen on unix socket %v: %w", app.Socket, err)
}
if err = os.Chmod(app.Socket, 0777); err != nil {
log.Warn("failed to chmod unix socket %v: %v", app.Socket, err)
}
} else {
addr := app.Address
l, err = net.Listen("tcp", addr)
if err != nil {
return fmt.Errorf("router: failed to listen on %v: %w", addr, err)
}
}
srv := &http.Server{Handler: engine}
httpServerMu.Lock()
httpServer = srv