mirror of
https://github.com/akyaiy/GoSally-mvp.git
synced 2026-01-05 12:52:24 +00:00
Refactor configuration and update handling:
- Modify .luarc.json to include global Lua scripts. - Update Makefile to include LDFLAGS for versioning. - Enhance node.go to implement version checking and update handling. - Refactor Lua global variables in _globals.lua and echo.lua to use new structures. - Remove deprecated http.lua and update config.yaml for TLS and update settings. - Introduce new update.go for version management and update checking. - Add tests for version comparison in update_test.go. - Improve error handling in various server methods.
This commit is contained in:
alex
216
core/update/update.go
Normal file
216
core/update/update.go
Normal file
@@ -0,0 +1,216 @@
|
||||
package update
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/akyaiy/GoSally-mvp/core/config"
|
||||
)
|
||||
|
||||
const (
|
||||
UpdateBranchStable = "stable"
|
||||
UpdateBranchDev = "dev"
|
||||
UpdateBranchTesting = "testing"
|
||||
)
|
||||
|
||||
type Version string
|
||||
type Branch string
|
||||
type IsNewUpdate bool
|
||||
|
||||
type UpdaterContract interface {
|
||||
CkeckUpdates() (IsNewUpdate, error)
|
||||
Update() error
|
||||
GetCurrentVersion() (Version, Branch, error)
|
||||
GetLatestVersion(updateBranch Branch) (Version, Branch, error)
|
||||
}
|
||||
|
||||
type Updater struct {
|
||||
Log slog.Logger
|
||||
Config *config.ConfigConf
|
||||
}
|
||||
|
||||
func NewUpdater(log slog.Logger, cfg *config.ConfigConf) *Updater {
|
||||
return &Updater{
|
||||
Log: log,
|
||||
Config: cfg,
|
||||
}
|
||||
}
|
||||
|
||||
func splitVersionString(versionStr string) (Version, Branch, error) {
|
||||
versionStr = strings.TrimSpace(versionStr)
|
||||
if !strings.HasPrefix(versionStr, "version") {
|
||||
return "", "unknown", errors.New("version string does not start with 'version'")
|
||||
}
|
||||
parts := strings.SplitN(versionStr[len("version"):], "-", 2)
|
||||
parts[0] = strings.TrimPrefix(parts[0], "version")
|
||||
if len(parts) != 2 {
|
||||
return Version(parts[0]), Branch("unknown"), errors.New("version string format invalid")
|
||||
}
|
||||
return Version(parts[0]), Branch(parts[1]), nil
|
||||
}
|
||||
|
||||
// isVersionNewer compares two version strings and returns true if the current version is newer than the latest version.
|
||||
func isVersionNewer(current, latest Version) bool {
|
||||
if current == latest {
|
||||
return false
|
||||
}
|
||||
|
||||
currentParts := strings.Split(string(current), ".")
|
||||
latestParts := strings.Split(string(latest), ".")
|
||||
|
||||
maxLen := len(currentParts)
|
||||
if len(latestParts) > maxLen {
|
||||
maxLen = len(latestParts)
|
||||
}
|
||||
|
||||
for i := 0; i < maxLen; i++ {
|
||||
var curPart, latPart int
|
||||
|
||||
if i < len(currentParts) {
|
||||
cur, err := strconv.Atoi(currentParts[i])
|
||||
if err != nil {
|
||||
cur = 0 // или можно обработать ошибку иначе
|
||||
}
|
||||
curPart = cur
|
||||
} else {
|
||||
curPart = 0 // Если части в current меньше, считаем недостающие нулями
|
||||
}
|
||||
|
||||
if i < len(latestParts) {
|
||||
lat, err := strconv.Atoi(latestParts[i])
|
||||
if err != nil {
|
||||
lat = 0
|
||||
}
|
||||
latPart = lat
|
||||
} else {
|
||||
latPart = 0
|
||||
}
|
||||
|
||||
if curPart < latPart {
|
||||
return true
|
||||
}
|
||||
if curPart > latPart {
|
||||
return false
|
||||
}
|
||||
// если равны — идём дальше
|
||||
}
|
||||
return false // все части равны, значит не новее
|
||||
}
|
||||
|
||||
// if len(currentParts) >= 1 && len(latestParts) >= 1 {
|
||||
// if currentParts[0] < latestParts[0] {
|
||||
// if len(currentParts) < 2 || len(latestParts) < 2 {
|
||||
// if currentParts[1] < latestParts[1] {
|
||||
// return true
|
||||
// }
|
||||
// if currentParts[1] > latestParts[1] {
|
||||
// return false
|
||||
// }
|
||||
// }
|
||||
// if currentParts[0] > latestParts[0] {
|
||||
// return false
|
||||
// }
|
||||
// }
|
||||
|
||||
// GetCurrentVersion reads the current version from the version file and returns it along with the branch.
|
||||
func (u *Updater) GetCurrentVersion() (Version, Branch, error) {
|
||||
version, branch, err := splitVersionString(string(config.GetUpdateConsts().GetNodeVersion()))
|
||||
if err != nil {
|
||||
u.Log.Error("Failed to parse version string", slog.String("version", string(config.GetUpdateConsts().GetNodeVersion())), slog.String("error", err.Error()))
|
||||
return "", "", err
|
||||
}
|
||||
switch branch {
|
||||
case UpdateBranchDev, UpdateBranchStable, UpdateBranchTesting:
|
||||
return Version(version), Branch(branch), nil
|
||||
default:
|
||||
return Version(version), Branch("unknown"), nil
|
||||
}
|
||||
}
|
||||
|
||||
func (u *Updater) GetLatestVersion(updateBranch Branch) (Version, Branch, error) {
|
||||
repoURL := u.Config.Updates.RepositoryURL
|
||||
if repoURL == "" {
|
||||
u.Log.Error("RepositoryURL is empty in config")
|
||||
return "", "", errors.New("repository URL is empty")
|
||||
}
|
||||
if !strings.HasPrefix(repoURL, "http://") && !strings.HasPrefix(repoURL, "https://") {
|
||||
u.Log.Error("RepositoryURL does not start with http:// or https://", slog.String("RepositoryURL", repoURL))
|
||||
return "", "", errors.New("repository URL must start with http:// or https://")
|
||||
}
|
||||
response, err := http.Get(repoURL + "/" + config.GetUpdateConsts().GetActualFileName())
|
||||
if err != nil {
|
||||
u.Log.Error("Failed to fetch latest version", slog.String("error", err.Error()))
|
||||
return "", "", err
|
||||
}
|
||||
defer response.Body.Close()
|
||||
if response.StatusCode != http.StatusOK {
|
||||
u.Log.Error("Failed to fetch latest version", slog.Int("status", response.StatusCode))
|
||||
return "", "", errors.New("failed to fetch latest version, status code: " + http.StatusText(response.StatusCode))
|
||||
}
|
||||
data, err := io.ReadAll(response.Body)
|
||||
if err != nil {
|
||||
u.Log.Error("Failed to read latest version response", slog.String("error", err.Error()))
|
||||
return "", "", err
|
||||
}
|
||||
lines := strings.Split(string(data), "\n")
|
||||
for _, line := range lines {
|
||||
line = strings.TrimSpace(line)
|
||||
if line == "" || strings.HasPrefix(line, "#") {
|
||||
continue
|
||||
}
|
||||
version, branch, err := splitVersionString(string(line))
|
||||
if err != nil {
|
||||
u.Log.Error("Failed to parse version string", slog.String("version", string(line)), slog.String("error", err.Error()))
|
||||
return "", "", err
|
||||
}
|
||||
if branch == updateBranch {
|
||||
return Version(version), Branch(branch), nil
|
||||
}
|
||||
}
|
||||
u.Log.Warn("No version found for branch", slog.String("branch", string(updateBranch)))
|
||||
return "", "", errors.New("no version found for branch: " + string(updateBranch))
|
||||
}
|
||||
|
||||
func (u *Updater) CkeckUpdates() (IsNewUpdate, error) {
|
||||
currentVersion, currentBranch, err := u.GetCurrentVersion()
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
latestVersion, latestBranch, err := u.GetLatestVersion(currentBranch)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if currentVersion == latestVersion && currentBranch == latestBranch {
|
||||
return false, nil
|
||||
}
|
||||
u.Log.Info("New update available",
|
||||
slog.String("current_version", string(currentVersion)),
|
||||
slog.String("current_branch", string(currentBranch)),
|
||||
slog.String("latest_version", string(latestVersion)),
|
||||
slog.String("latest_branch", string(latestBranch)),
|
||||
)
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// func (u *Updater) Update() error {
|
||||
// if !(u.Config.UpdatesEnabled && u.Config.Updates.AllowUpdates && u.Config.Updates.AllowDowngrades) {
|
||||
// u.Log.Info("Updates are disabled in config, skipping update")
|
||||
// return nil
|
||||
// }
|
||||
// wantedVersion := u.Config.Updates.WantedVersion
|
||||
// _, wantedBranch, _ := splitVersionString(wantedVersion)
|
||||
// newVersion, newBranch, err := u.GetLatestVersion(wantedBranch)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// if wantedBranch != newBranch {
|
||||
// u.Log.Info("Wanted version branch does not match latest version branch: updating wanted branch",
|
||||
// slog.String("wanted_branch", string(wantedBranch)),
|
||||
// slog.String("latest_branch", string(newBranch)),
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
30
core/update/update_test.go
Normal file
30
core/update/update_test.go
Normal file
@@ -0,0 +1,30 @@
|
||||
package update
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFunc_isVersionNewer(t *testing.T) {
|
||||
tests := []struct {
|
||||
current string
|
||||
latest string
|
||||
want bool
|
||||
}{
|
||||
{"1.0.0", "1.0.0", false},
|
||||
{"1.0.0", "1.0.1", true},
|
||||
{"1.0.1", "1.0.0", false},
|
||||
{"2.0.0", "1.9.9", false},
|
||||
{"2.2.3", "1.9.9", false},
|
||||
{"22.2.3", "1.9.9", false},
|
||||
{"1.2.3", "1.99.9", true},
|
||||
{"1.10", "1.5.99999", false},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.current+" vs "+tt.latest, func(t *testing.T) {
|
||||
if got := isVersionNewer(Version(tt.current), Version(tt.latest)); got != tt.want {
|
||||
t.Errorf("isVersionNewer(%q, %q) = %v; want %v", tt.current, tt.latest, got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user