mrlee/Havline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rename project from Fonu to Havline
CI / verify (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
mrlee
2026-10-01 16:54:35 +08:00
parent c377405696
commit 8fa5d922ac
250 changed files with 6724 additions and 5070 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/updater/client.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"time"
)
// Client 通过共享 Unix Socket 调用 fonu-updater sidecar。
// Client 通过共享 Unix Socket 调用 havline-updater sidecar。
type Client struct {
socketPath string
http *http.Client
internal/updater/model.go
+1 -1
View File
@@ -16,7 +16,7 @@ const (
PhaseFailed Phase = "failed"
)
// Status 是主程序与 fonu-updater sidecar 共享的更新状态。
// Status 是主程序与 havline-updater sidecar 共享的更新状态。
type Status struct {
Enabled bool `json:"enabled"`
Mode string `json:"mode"`
internal/updater/remote_version_test.go
+5 -5
View File
@@ -11,14 +11,14 @@ import (
)
func TestRemoteVersionURLs(t *testing.T) {
urls, err := remoteVersionURLs("http://example.com/mrlee/-Fonu.git", "main")
urls, err := remoteVersionURLs("http://example.com/mrlee/Havline.git", "main")
if err != nil {
t.Fatal(err)
}
if len(urls) == 0 || !strings.Contains(urls[0], "/api/v1/repos/mrlee/-Fonu/contents/VERSION") {
if len(urls) == 0 || !strings.Contains(urls[0], "/api/v1/repos/mrlee/Havline/contents/VERSION") {
t.Fatalf("缺少 Gitea API 候选地址: %#v", urls)
}
if !strings.Contains(urls[1], "/mrlee/-Fonu/raw/branch/main/VERSION") {
if !strings.Contains(urls[1], "/mrlee/Havline/raw/branch/main/VERSION") {
t.Fatalf("缺少 Gitea raw 候选地址: %#v", urls)
}
}
@@ -38,7 +38,7 @@ func TestParseRemoteVersion(t *testing.T) {
func TestFetchRemoteVersionFromGiteaAPI(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/api/v1/repos/mrlee/-Fonu/contents/VERSION" {
if r.URL.Path != "/api/v1/repos/mrlee/Havline/contents/VERSION" {
http.NotFound(w, r)
return
}
@@ -49,7 +49,7 @@ func TestFetchRemoteVersionFromGiteaAPI(t *testing.T) {
}))
defer server.Close()
got, err := fetchRemoteVersion(context.Background(), server.URL+"/mrlee/-Fonu.git", "main")
got, err := fetchRemoteVersion(context.Background(), server.URL+"/mrlee/Havline.git", "main")
if err != nil {
t.Fatal(err)
}
internal/updater/runner.go
+5 -5
View File
@@ -60,7 +60,7 @@ func (s *Server) runUpdate(ctx context.Context) error {
}
func (s *Server) build(ctx context.Context, version string) error {
s.logf("开始构建 fonu:%s，这一步可能持续几分钟", version)
s.logf("开始构建 havline:%s，这一步可能持续几分钟", version)
buildCtx, cancel := context.WithTimeout(ctx, s.cfg.BuildTimeout)
defer cancel()
if _, err := s.compose(buildCtx, version, "build", s.cfg.Service); err != nil {
@@ -105,14 +105,14 @@ func (s *Server) rollback(previousImage string) {
s.logf("无法确定上一个镜像 tag，跳过自动回滚")
return
}
s.logf("发现升级失败，尝试回滚到 fonu:%s", version)
s.logf("发现升级失败，尝试回滚到 havline:%s", version)
rollbackCtx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
defer cancel()
if _, err := s.compose(rollbackCtx, version, "up", "-d", "--no-deps", "--force-recreate", s.cfg.Service); err != nil {
s.logf("自动回滚失败：%v", err)
return
}
s.logf("已切回 fonu:%s", version)
s.logf("已切回 havline:%s", version)
}
func (s *Server) prepareLocalSource(ctx context.Context) error {
@@ -324,7 +324,7 @@ func (s *Server) compose(ctx context.Context, version string, args ...string) (s
return s.composeViaHelper(ctx, plan, version, args...)
}
fullArgs := append([]string{"compose", "--project-name", plan.projectName, "-f", plan.containerCompose}, args...)
env := []string{"FONU_VERSION=" + version}
env := []string{"HAVLINE_VERSION=" + version}
return runCommand(ctx, s.cfg.ProjectDir, env, "docker", fullArgs...)
}
@@ -338,7 +338,7 @@ func (s *Server) composeViaHelper(ctx context.Context, plan composePlan, version
"-v", s.cfg.DockerSocket + ":/var/run/docker.sock",
"-v", plan.hostProjectDir + ":/workspace",
"-w", "/workspace",
"-e", "FONU_VERSION=" + version,
"-e", "HAVLINE_VERSION=" + version,
image,
"compose", "--project-name", plan.projectName, "-f", plan.helperComposePath,
}
internal/updater/server.go
+11 -11
View File
@@ -20,7 +20,7 @@ var ErrBusy = errors.New("升级任务正在进行中")
var serviceNamePattern = regexp.MustCompile(`^[a-zA-Z0-9_.-]+$`)
// Config 是 fonu-updater sidecar 的运行配置。
// Config 是 havline-updater sidecar 的运行配置。
type Config struct {
SocketPath string
ProjectDir string
@@ -61,7 +61,7 @@ type composePlan struct {
func NewServer(cfg Config, logger *slog.Logger) (*Server, error) {
cfg.SocketPath = strings.TrimSpace(cfg.SocketPath)
if cfg.SocketPath == "" {
cfg.SocketPath = "/run/fonu-updater/updater.sock"
cfg.SocketPath = "/run/havline-updater/updater.sock"
}
if strings.TrimSpace(cfg.ProjectDir) == "" {
cfg.ProjectDir = "/workspace"
@@ -70,7 +70,7 @@ func NewServer(cfg Config, logger *slog.Logger) (*Server, error) {
cfg.ComposeFile = "docker-compose.yml"
}
if strings.TrimSpace(cfg.Service) == "" {
cfg.Service = "fonu"
cfg.Service = "havline"
}
if strings.TrimSpace(cfg.Mode) == "" {
cfg.Mode = "local"
@@ -79,7 +79,7 @@ func NewServer(cfg Config, logger *slog.Logger) (*Server, error) {
cfg.Branch = "main"
}
if strings.TrimSpace(cfg.AppURL) == "" {
cfg.AppURL = "http://fonu:6893"
cfg.AppURL = "http://havline:6893"
}
if strings.TrimSpace(cfg.DockerSocket) == "" {
cfg.DockerSocket = "/var/run/docker.sock"
@@ -94,17 +94,17 @@ func NewServer(cfg Config, logger *slog.Logger) (*Server, error) {
cfg.HealthTimeout = 3 * time.Minute
}
if cfg.Mode != "local" && cfg.Mode != "git" {
return nil, fmt.Errorf("FONU_UPDATE_MODE 只支持 local 或 git")
return nil, fmt.Errorf("HAVLINE_UPDATE_MODE 只支持 local 或 git")
}
if !serviceNamePattern.MatchString(cfg.Service) {
return nil, fmt.Errorf("FONU_UPDATE_SERVICE 含非法字符")
return nil, fmt.Errorf("HAVLINE_UPDATE_SERVICE 含非法字符")
}
composePath, err := resolveComposePath(cfg.ProjectDir, cfg.ComposeFile)
if err != nil {
return nil, err
}
if cfg.Mode == "git" && strings.TrimSpace(cfg.RepoURL) == "" {
return nil, fmt.Errorf("git 模式必须设置 FONU_UPDATE_REPO")
return nil, fmt.Errorf("git 模式必须设置 HAVLINE_UPDATE_REPO")
}
if logger == nil {
logger = slog.Default()
@@ -211,7 +211,7 @@ func (s *Server) resolveComposePlan(ctx context.Context) (composePlan, error) {
}, nil
}
}
return composePlan{}, fmt.Errorf("找不到 Compose 文件 %s，且无法自动定位宿主机目录；请设置 FONU_UPDATE_HOST_DIR", s.composePath)
return composePlan{}, fmt.Errorf("找不到 Compose 文件 %s，且无法自动定位宿主机目录；请设置 HAVLINE_UPDATE_HOST_DIR", s.composePath)
}
func (s *Server) composeProjectName(ctx context.Context) (string, error) {
@@ -226,13 +226,13 @@ func (s *Server) composeProjectName(ctx context.Context) (string, error) {
if err != nil {
return "", fmt.Errorf("无法读取现有容器的 Compose 项目标签：%w", err)
}
return "", fmt.Errorf("现有 fonu 容器不是由 Compose 管理，无法安全一键升级；请按 Compose 方式重新部署")
return "", fmt.Errorf("现有 havline 容器不是由 Compose 管理，无法安全一键升级；请按 Compose 方式重新部署")
}
func (s *Server) discoverHostCompose(ctx context.Context) (string, string, error) {
if s.cfg.HostProjectDir != "" && !isContainerPath(s.cfg.HostProjectDir, s.cfg.ProjectDir) {
if !filepath.IsAbs(s.cfg.HostProjectDir) {
return "", "", fmt.Errorf("FONU_UPDATE_HOST_DIR 必须是绝对路径")
return "", "", fmt.Errorf("HAVLINE_UPDATE_HOST_DIR 必须是绝对路径")
}
return s.cfg.HostProjectDir, filepath.Join(s.cfg.HostProjectDir, filepath.Base(s.cfg.ComposeFile)), nil
}
@@ -367,7 +367,7 @@ func (s *Server) Apply(_ context.Context) (Status, error) {
}
s.state.Phase = PhaseScheduled
s.state.Busy = true
s.state.Message = "升级任务已排队，即将重启 Fonu"
s.state.Message = "升级任务已排队，即将重启 Havline"
s.state.Log = []string{"升级任务已排队"}
status := cloneStatus(s.state)
s.mu.Unlock()
internal/updater/server_test.go
+2 -2
View File
@@ -46,7 +46,7 @@ func TestNewServerDefaultsAndValidation(t *testing.T) {
func TestEnsureComposeFile(t *testing.T) {
dir := t.TempDir()
server, err := NewServer(Config{ProjectDir: dir, ComposeFile: "docker-compose.yml", ProjectName: "fonu"}, nil)
server, err := NewServer(Config{ProjectDir: dir, ComposeFile: "docker-compose.yml", ProjectName: "havline"}, nil)
if err != nil {
t.Fatal(err)
}
@@ -69,7 +69,7 @@ func TestResolveComposePlanUsesHostProjectDir(t *testing.T) {
ProjectDir: containerDir,
ComposeFile: "docker-compose.hub.yml",
HostProjectDir: hostDir,
ProjectName: "fonu",
ProjectName: "havline",
}, nil)
if err != nil {
t.Fatal(err)