|
@@ -8,6 +8,7 @@ import (
|
|
|
"os"
|
|
"os"
|
|
|
"os/exec"
|
|
"os/exec"
|
|
|
"path/filepath"
|
|
"path/filepath"
|
|
|
|
|
+ "regexp"
|
|
|
"runtime"
|
|
"runtime"
|
|
|
"strconv"
|
|
"strconv"
|
|
|
"strings"
|
|
"strings"
|
|
@@ -25,17 +26,27 @@ import (
|
|
|
type PanelService struct{}
|
|
type PanelService struct{}
|
|
|
|
|
|
|
|
// PanelUpdateInfo contains the current and latest available panel versions.
|
|
// PanelUpdateInfo contains the current and latest available panel versions.
|
|
|
|
|
+// On the dev channel the version fields carry a "dev+<sha>" label and the commit
|
|
|
|
|
+// fields hold the short SHAs that drive the update-available decision.
|
|
|
type PanelUpdateInfo struct {
|
|
type PanelUpdateInfo struct {
|
|
|
|
|
+ Channel string `json:"channel"`
|
|
|
CurrentVersion string `json:"currentVersion"`
|
|
CurrentVersion string `json:"currentVersion"`
|
|
|
LatestVersion string `json:"latestVersion"`
|
|
LatestVersion string `json:"latestVersion"`
|
|
|
|
|
+ CurrentCommit string `json:"currentCommit,omitempty"`
|
|
|
|
|
+ LatestCommit string `json:"latestCommit,omitempty"`
|
|
|
UpdateAvailable bool `json:"updateAvailable"`
|
|
UpdateAvailable bool `json:"updateAvailable"`
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const (
|
|
const (
|
|
|
panelUpdaterURL = "https://raw.githubusercontent.com/MHSanaei/3x-ui/main/update.sh"
|
|
panelUpdaterURL = "https://raw.githubusercontent.com/MHSanaei/3x-ui/main/update.sh"
|
|
|
maxPanelUpdaterBytes = 2 << 20
|
|
maxPanelUpdaterBytes = 2 << 20
|
|
|
|
|
+ // devReleaseTag is the fixed-tag rolling pre-release the CI force-moves to the
|
|
|
|
|
+ // newest main commit; the dev update channel installs from it.
|
|
|
|
|
+ devReleaseTag = "dev-latest"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
+var releaseCommitRegex = regexp.MustCompile(`(?i)commit=([0-9a-f]{7,40})`)
|
|
|
|
|
+
|
|
|
func (s *PanelService) RestartPanel(delay time.Duration) error {
|
|
func (s *PanelService) RestartPanel(delay time.Duration) error {
|
|
|
go func() {
|
|
go func() {
|
|
|
time.Sleep(delay)
|
|
time.Sleep(delay)
|
|
@@ -58,20 +69,59 @@ func (s *PanelService) RestartPanel(delay time.Duration) error {
|
|
|
return nil
|
|
return nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// GetUpdateInfo checks GitHub for the latest 3x-ui release.
|
|
|
|
|
|
|
+// GetUpdateInfo checks GitHub for the latest 3x-ui release. When the dev channel
|
|
|
|
|
+// is enabled on a dev build it compares commits against the rolling dev release;
|
|
|
|
|
+// otherwise it compares versions against the latest stable tag.
|
|
|
func (s *PanelService) GetUpdateInfo() (*PanelUpdateInfo, error) {
|
|
func (s *PanelService) GetUpdateInfo() (*PanelUpdateInfo, error) {
|
|
|
|
|
+ if devChannelActive() {
|
|
|
|
|
+ return getDevUpdateInfo()
|
|
|
|
|
+ }
|
|
|
latest, err := fetchLatestPanelVersion()
|
|
latest, err := fetchLatestPanelVersion()
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
current := config.GetVersion()
|
|
current := config.GetVersion()
|
|
|
return &PanelUpdateInfo{
|
|
return &PanelUpdateInfo{
|
|
|
|
|
+ Channel: "stable",
|
|
|
CurrentVersion: current,
|
|
CurrentVersion: current,
|
|
|
LatestVersion: latest,
|
|
LatestVersion: latest,
|
|
|
UpdateAvailable: isNewerVersion(latest, current),
|
|
UpdateAvailable: isNewerVersion(latest, current),
|
|
|
}, nil
|
|
}, nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+// devChannelActive reports whether self-update should track the rolling dev
|
|
|
|
|
+// release. It requires both the opt-in setting and a dev build, so a stable
|
|
|
|
|
+// binary with the toggle left on never cross-grades to the dev channel.
|
|
|
|
|
+func devChannelActive() bool {
|
|
|
|
|
+ if !config.IsDevBuild() {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ enabled, err := (&service.SettingService{}).GetDevChannelEnable()
|
|
|
|
|
+ return err == nil && enabled
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+// getDevUpdateInfo compares the running commit against the commit recorded in the
|
|
|
|
|
+// rolling dev release.
|
|
|
|
|
+func getDevUpdateInfo() (*PanelUpdateInfo, error) {
|
|
|
|
|
+ release, err := fetchPanelRelease(devReleaseTag)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ return nil, err
|
|
|
|
|
+ }
|
|
|
|
|
+ latestCommit := extractReleaseCommit(release)
|
|
|
|
|
+ if latestCommit == "" {
|
|
|
|
|
+ return nil, fmt.Errorf("dev release commit is unknown")
|
|
|
|
|
+ }
|
|
|
|
|
+ currentCommit := config.GetBuildCommit()
|
|
|
|
|
+ return &PanelUpdateInfo{
|
|
|
|
|
+ Channel: "dev",
|
|
|
|
|
+ CurrentVersion: config.GetVersion(),
|
|
|
|
|
+ CurrentCommit: shortCommit(currentCommit),
|
|
|
|
|
+ LatestCommit: shortCommit(latestCommit),
|
|
|
|
|
+ LatestVersion: "dev+" + shortCommit(latestCommit),
|
|
|
|
|
+ UpdateAvailable: !commitsEqual(currentCommit, latestCommit),
|
|
|
|
|
+ }, nil
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
// StartUpdate starts the official updater outside of the current web request.
|
|
// StartUpdate starts the official updater outside of the current web request.
|
|
|
func (s *PanelService) StartUpdate() error {
|
|
func (s *PanelService) StartUpdate() error {
|
|
|
if runtime.GOOS != "linux" {
|
|
if runtime.GOOS != "linux" {
|
|
@@ -89,6 +139,10 @@ func (s *PanelService) StartUpdate() error {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
mainFolder, serviceFolder := resolveUpdateFolders()
|
|
mainFolder, serviceFolder := resolveUpdateFolders()
|
|
|
|
|
+ updateTag := ""
|
|
|
|
|
+ if devChannelActive() {
|
|
|
|
|
+ updateTag = devReleaseTag
|
|
|
|
|
+ }
|
|
|
updateScript := fmt.Sprintf("set -e; trap 'rm -f %s' EXIT; %s %s", shellQuote(scriptPath), shellQuote(bash), shellQuote(scriptPath))
|
|
updateScript := fmt.Sprintf("set -e; trap 'rm -f %s' EXIT; %s %s", shellQuote(scriptPath), shellQuote(bash), shellQuote(scriptPath))
|
|
|
|
|
|
|
|
if systemdRun, err := exec.LookPath("systemd-run"); err == nil {
|
|
if systemdRun, err := exec.LookPath("systemd-run"); err == nil {
|
|
@@ -97,6 +151,7 @@ func (s *PanelService) StartUpdate() error {
|
|
|
"--unit", unitName,
|
|
"--unit", unitName,
|
|
|
"--setenv", "XUI_MAIN_FOLDER="+mainFolder,
|
|
"--setenv", "XUI_MAIN_FOLDER="+mainFolder,
|
|
|
"--setenv", "XUI_SERVICE="+serviceFolder,
|
|
"--setenv", "XUI_SERVICE="+serviceFolder,
|
|
|
|
|
+ "--setenv", "XUI_UPDATE_TAG="+updateTag,
|
|
|
bash, "-lc", updateScript,
|
|
bash, "-lc", updateScript,
|
|
|
)
|
|
)
|
|
|
out, err := cmd.CombinedOutput()
|
|
out, err := cmd.CombinedOutput()
|
|
@@ -118,6 +173,7 @@ func (s *PanelService) StartUpdate() error {
|
|
|
cmd.Env = append(os.Environ(),
|
|
cmd.Env = append(os.Environ(),
|
|
|
"XUI_MAIN_FOLDER="+mainFolder,
|
|
"XUI_MAIN_FOLDER="+mainFolder,
|
|
|
"XUI_SERVICE="+serviceFolder,
|
|
"XUI_SERVICE="+serviceFolder,
|
|
|
|
|
+ "XUI_UPDATE_TAG="+updateTag,
|
|
|
)
|
|
)
|
|
|
setDetachedProcess(cmd)
|
|
setDetachedProcess(cmd)
|
|
|
if err := cmd.Start(); err != nil {
|
|
if err := cmd.Start(); err != nil {
|
|
@@ -170,24 +226,86 @@ func downloadPanelUpdater() (string, error) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func fetchLatestPanelVersion() (string, error) {
|
|
func fetchLatestPanelVersion() (string, error) {
|
|
|
- client := (&service.SettingService{}).NewProxiedHTTPClient(10 * time.Second)
|
|
|
|
|
- resp, err := client.Get("https://api.github.com/repos/MHSanaei/3x-ui/releases/latest")
|
|
|
|
|
|
|
+ release, err := fetchPanelRelease("")
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return "", err
|
|
return "", err
|
|
|
}
|
|
}
|
|
|
|
|
+ if release.TagName == "" {
|
|
|
|
|
+ return "", fmt.Errorf("latest panel release tag is empty")
|
|
|
|
|
+ }
|
|
|
|
|
+ return release.TagName, nil
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+// fetchPanelRelease fetches a release from GitHub. An empty tag resolves the
|
|
|
|
|
+// latest stable release; a non-empty tag (e.g. dev-latest) resolves that tag.
|
|
|
|
|
+func fetchPanelRelease(tag string) (*service.Release, error) {
|
|
|
|
|
+ url := "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest"
|
|
|
|
|
+ if tag != "" {
|
|
|
|
|
+ url = "https://api.github.com/repos/MHSanaei/3x-ui/releases/tags/" + tag
|
|
|
|
|
+ }
|
|
|
|
|
+ client := (&service.SettingService{}).NewProxiedHTTPClient(10 * time.Second)
|
|
|
|
|
+ resp, err := client.Get(url)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ return nil, err
|
|
|
|
|
+ }
|
|
|
defer resp.Body.Close()
|
|
defer resp.Body.Close()
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
if resp.StatusCode != http.StatusOK {
|
|
|
- return "", fmt.Errorf("GitHub API returned status %d: %s", resp.StatusCode, resp.Status)
|
|
|
|
|
|
|
+ return nil, fmt.Errorf("GitHub API returned status %d: %s", resp.StatusCode, resp.Status)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var release service.Release
|
|
var release service.Release
|
|
|
if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
|
|
if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
|
|
|
- return "", err
|
|
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
- if release.TagName == "" {
|
|
|
|
|
- return "", fmt.Errorf("latest panel release tag is empty")
|
|
|
|
|
|
|
+ return &release, nil
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+// extractReleaseCommit reads the build commit recorded in the dev release: first
|
|
|
|
|
+// the `commit=<sha>` marker the CI writes into the body, falling back to the
|
|
|
|
|
+// tag's target commit.
|
|
|
|
|
+func extractReleaseCommit(release *service.Release) string {
|
|
|
|
|
+ if m := releaseCommitRegex.FindStringSubmatch(release.Body); m != nil {
|
|
|
|
|
+ return strings.ToLower(m[1])
|
|
|
}
|
|
}
|
|
|
- return release.TagName, nil
|
|
|
|
|
|
|
+ if isCommitSHA(release.TargetCommitish) {
|
|
|
|
|
+ return strings.ToLower(release.TargetCommitish)
|
|
|
|
|
+ }
|
|
|
|
|
+ return ""
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+func isCommitSHA(s string) bool {
|
|
|
|
|
+ s = strings.TrimSpace(s)
|
|
|
|
|
+ if len(s) < 7 || len(s) > 40 {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ for _, r := range s {
|
|
|
|
|
+ if (r < '0' || r > '9') && (r < 'a' || r > 'f') && (r < 'A' || r > 'F') {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return true
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+func shortCommit(sha string) string {
|
|
|
|
|
+ sha = strings.TrimSpace(sha)
|
|
|
|
|
+ if len(sha) > 8 {
|
|
|
|
|
+ return sha[:8]
|
|
|
|
|
+ }
|
|
|
|
|
+ return sha
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+// commitsEqual compares a short (injected) commit against a full release commit
|
|
|
|
|
+// by prefix, so an 8-char build stamp matches the 40-char release SHA.
|
|
|
|
|
+func commitsEqual(a, b string) bool {
|
|
|
|
|
+ a = strings.ToLower(strings.TrimSpace(a))
|
|
|
|
|
+ b = strings.ToLower(strings.TrimSpace(b))
|
|
|
|
|
+ if a == "" || b == "" {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ if len(a) > len(b) {
|
|
|
|
|
+ a, b = b, a
|
|
|
|
|
+ }
|
|
|
|
|
+ return strings.HasPrefix(b, a)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func resolveUpdateFolders() (string, string) {
|
|
func resolveUpdateFolders() (string, string) {
|