修复 daemon 启动问题,分离 GUI 和 daemon 二进制

- 分离二进制: cmd/lmvpn (GUI+Fyne) 和 cmd/lmvpnd (daemon, 无 Fyne)
  消除 daemon 启动时的 Fyne locale 初始化错误
- 新增 daemon-launch 子命令: 用 syscall.SysProcAttr{Setsid: true}
  替代 nohup, 解决 osascript 无 TTY 时的 'Inappropriate ioctl' 错误
- daemon 日志写到用户家目录: paths.SetUserHome() 覆盖 root 默认路径
- IPC socket chown 给用户: 解决 root:wheel 0660 导致 GUI 无法连接
- 修复 JWT→密码认证回退: 捕获 ServerError{auth_err} 而非仅 AuthError
- 修复 token URL 编码: 用 url.QueryEscape 替代裸拼接
- 日志去重: LMVPN_DAEMON=1 时 daemon 不再 stderr 镜像到文件
- Makefile 构建双二进制并打包到 .app bundle
This commit is contained in:
2026-07-06 17:46:36 +08:00
parent 124d6ad363
commit b0aa386ee2
13 changed files with 400 additions and 64 deletions
+12 -9
View File
@@ -2,7 +2,8 @@
APP_NAME = LMVPN
BUNDLE_ID = com.lmvpn.client
BINARY = lmvpn
GUI_BIN = lmvpn
DAEMON_BIN = lmvpnd
BUILD_DIR = build
APP_BUNDLE = $(APP_NAME).app
@@ -10,22 +11,24 @@ GO = go
CGO_ENABLED = 1
LDFLAGS = -s -w
.PHONY: all build app run daemon clean vet tidy fmt
.PHONY: all build app run daemon clean vet tidy fmt icon
## all: build the .app bundle (default)
all: app
## build: compile the binary
## build: compile both the GUI and daemon binaries
build:
mkdir -p $(BUILD_DIR)
CGO_ENABLED=$(CGO_ENABLED) $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY) .
CGO_ENABLED=$(CGO_ENABLED) $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(GUI_BIN) ./cmd/lmvpn
CGO_ENABLED=$(CGO_ENABLED) $(GO) build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(DAEMON_BIN) ./cmd/lmvpnd
## app: build binary and assemble .app bundle
## app: build binaries and assemble .app bundle
app: build
rm -rf $(APP_BUNDLE)
mkdir -p $(APP_BUNDLE)/Contents/MacOS
mkdir -p $(APP_BUNDLE)/Contents/Resources
cp $(BUILD_DIR)/$(BINARY) $(APP_BUNDLE)/Contents/MacOS/$(BINARY)
cp $(BUILD_DIR)/$(GUI_BIN) $(APP_BUNDLE)/Contents/MacOS/$(GUI_BIN)
cp $(BUILD_DIR)/$(DAEMON_BIN) $(APP_BUNDLE)/Contents/MacOS/$(DAEMON_BIN)
cp resources/Info.plist $(APP_BUNDLE)/Contents/Info.plist
@if [ -f resources/icon.icns ]; then \
cp resources/icon.icns $(APP_BUNDLE)/Contents/Resources/icon.icns; \
@@ -50,11 +53,11 @@ icon:
## run: build and run the GUI
run: build
./$(BUILD_DIR)/$(BINARY)
./$(BUILD_DIR)/$(GUI_BIN)
## daemon: run the daemon (needs root)
## daemon: run the daemon directly (needs root)
daemon: build
sudo ./$(BUILD_DIR)/$(BINARY) daemon
sudo ./$(BUILD_DIR)/$(DAEMON_BIN)
## vet: run go vet
vet: