⭐ feat: restart server after binary recompile (#256)

- Added version and build ID headers for client verification.
- Enhanced health checks to validate server version and build ID.
- Updated server versioning to reflect current version and commit ID.
- Improved error handling for robust server communication.

Author: vangie

packages/cli/internal/daemon/manager.go

@@ -13,11 +13,18 @@ import (
 	"strconv"
 	"syscall"
 	"time"
+
+	"github.com/babelcloud/gbox/packages/cli/internal/server"
+	"github.com/babelcloud/gbox/packages/cli/internal/version"
 )
 
 const (
 	DefaultPort = 29888 // New port for unified gbox server
 	ServerURL   = "http://localhost:29888"
+
+	// Version headers returned by server
+	serverHeaderVersion = "X-GBOX-Version"
+	serverHeaderBuildID = "X-GBOX-Build-ID"
 )
 
 // Manager handles the gbox server daemon lifecycle
@@ -72,13 +79,25 @@ func (m *Manager) IsServerRunning() bool {
 
 // checkHTTPHealth checks if server is responding to HTTP requests
 func (m *Manager) checkHTTPHealth() bool {
-	client := &http.Client{Timeout: 500 * time.Millisecond}
+	client := &http.Client{Timeout: 150 * time.Millisecond}
 	resp, err := client.Get(fmt.Sprintf("%s/api/server/info", m.url))
 	if err != nil {
 		return false
 	}
 	defer resp.Body.Close()
-	return resp.StatusCode == http.StatusOK
+
+	if resp.StatusCode != http.StatusOK {
+		return false
+	}
+	serverVersion := resp.Header.Get(serverHeaderVersion)
+	serverBuildID := resp.Header.Get(serverHeaderBuildID)
+	clientVersion := version.Version
+	clientBuildID := server.GetBuildID()
+	if (serverVersion != "" && clientVersion != "" && serverVersion != clientVersion) ||
+		(serverBuildID != "" && clientBuildID != "" && serverBuildID != clientBuildID) {
+		return false
+	}
+	return true
 }
 
 // StartServer starts the gbox server daemon
@@ -228,12 +247,58 @@ func (m *Manager) CallAPI(method, endpoint string, body interface{}, result inte
 	}
 
 	client := &http.Client{Timeout: 10 * time.Second}
-	resp, err := client.Do(req)
+
+	// perform is a small helper to execute the request
+	perform := func() (*http.Response, error) {
+		return client.Do(req)
+	}
+
+	resp, err := perform()
 	if err != nil {
 		return fmt.Errorf("API call failed: %v", err)
 	}
 	defer resp.Body.Close()
 
+	// Version/build-id check: compare headers with client values.
+	serverVersion := resp.Header.Get(serverHeaderVersion)
+	serverBuildID := resp.Header.Get(serverHeaderBuildID)
+	clientVersion := version.Version
+	clientBuildID := server.GetBuildID()
+
+	mismatch := false
+	if serverVersion != "" && clientVersion != "" && serverVersion != clientVersion {
+		mismatch = true
+	}
+	if serverBuildID != "" && clientBuildID != "" && serverBuildID != clientBuildID {
+		mismatch = true
+	}
+
+	if mismatch {
+		_ = m.StopServer()
+		if err := m.StartServer(); err != nil {
+			return fmt.Errorf("server mismatch (ver:%s!=%s or build:%s!=%s) and restart failed: %v", serverVersion, clientVersion, serverBuildID, clientBuildID, err)
+		}
+		// Retry once with a fresh request object (req body may have been consumed)
+		if body != nil {
+			jsonData, _ := json.Marshal(body)
+			req, err = http.NewRequest(method, url, bytes.NewReader(jsonData))
+			if err != nil {
+				return fmt.Errorf("failed to create retry request: %v", err)
+			}
+			req.Header.Set("Content-Type", "application/json")
+		} else {
+			req, err = http.NewRequest(method, url, nil)
+			if err != nil {
+				return fmt.Errorf("failed to create retry request: %v", err)
+			}
+		}
+		resp, err = perform()
+		if err != nil {
+			return fmt.Errorf("API call after restart failed: %v", err)
+		}
+		defer resp.Body.Close()
+	}
+
 	if resp.StatusCode >= 400 {
 		body, _ := io.ReadAll(resp.Body)
 		return fmt.Errorf("API error (status %d): %s", resp.StatusCode, string(body))

packages/cli/internal/server/handlers/api.go

@@ -105,5 +105,9 @@ func (h *APIHandlers) HandleServerInfo(w http.ResponseWriter, req *http.Request)
 	w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
 	w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
 
+	// Set version headers for client verification
+	w.Header().Set("X-GBOX-Version", h.serverService.GetVersion())
+	w.Header().Set("X-GBOX-Build-ID", h.serverService.GetBuildID())
+
 	RespondJSON(w, http.StatusOK, info)
 }

packages/cli/internal/server/version.go

@@ -5,6 +5,8 @@ import (
 	"os"
 	"runtime"
 	"time"
+
+	"github.com/babelcloud/gbox/packages/cli/internal/version"
 )
 
 // BuildInfo contains build-time information
@@ -14,9 +16,9 @@ var BuildInfo = struct {
 	GitCommit string
 	GoVersion string
 }{
-	Version:   "dev",
+	Version:   version.Version,
 	BuildTime: time.Now().Format(time.RFC3339),
-	GitCommit: "unknown",
+	GitCommit: version.CommitID,
 	GoVersion: runtime.Version(),
 }