Refactor core configuration and UUID handling

- Changed UUIDLength type from byte to int in core/config/consts.go
- Introduced MetaDir constant in core/config/consts.go
- Added corestate package with initial state management and UUID handling
- Implemented GetNodeUUID and SetNodeUUID functions for UUID file management
- Created RunManager and RunFileManager for runtime directory management
- Updated GeneralServer to use new configuration structure
- Removed deprecated init package and replaced with main entry point
- Added color utility functions for logging
- Enhanced UUID generation functions in utils package
- Updated update logic to handle new configuration structure
- Added routines for cleaning temporary runtime directories
- Introduced response formatting for API responses

core/config/compositor.go

@@ -0,0 +1,72 @@
+package config
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/spf13/viper"
+)
+
+func NewCompositor() *Compositor {
+	return &Compositor{}
+}
+
+func (c *Compositor) LoadEnv() error {
+	v := viper.New()
+
+	// defaults
+	v.SetDefault("config_path", "./cfg/config.yaml")
+	v.SetDefault("node_path", "./")
+	v.SetDefault("parent_pid", -1)
+
+	// GS_*
+	v.SetEnvPrefix("GS")
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	v.AutomaticEnv()
+
+	var env Env
+	if err := v.Unmarshal(&env); err != nil {
+		return fmt.Errorf("error unmarshaling env: %w", err)
+	}
+
+	c.Env = &env
+	return nil
+}
+
+func (c *Compositor) LoadConf(path string) error {
+	v := viper.New()
+
+	v.SetConfigFile(path)
+	v.SetConfigType("yaml")
+
+	// defaults
+	v.SetDefault("mode", "dev")
+	v.SetDefault("com_dir", "./com/")
+	v.SetDefault("http_server.address", "0.0.0.0:8080")
+	v.SetDefault("http_server.timeout", "5s")
+	v.SetDefault("http_server.idle_timeout", "60s")
+	v.SetDefault("tls.enabled", false)
+	v.SetDefault("tls.cert_file", "./cert/server.crt")
+	v.SetDefault("tls.key_file", "./cert/server.key")
+	v.SetDefault("updates.enabled", false)
+	v.SetDefault("updates.check_interval", "2h")
+	v.SetDefault("updates.wanted_version", "latest-stable")
+
+	// поддержка ENV-переопределений
+	v.SetEnvPrefix("GOSALLY")
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	v.AutomaticEnv()
+
+	// читаем YAML
+	if err := v.ReadInConfig(); err != nil {
+		return fmt.Errorf("error reading config: %w", err)
+	}
+
+	var cfg Conf
+	if err := v.Unmarshal(&cfg); err != nil {
+		return fmt.Errorf("error unmarshaling config: %w", err)
+	}
+
+	c.Conf = &cfg
+	return nil
+}

core/config/config.go

@@ -3,76 +3,57 @@
 package config
 
 import (
-	"log"
-	"os"
 	"time"
-
-	"github.com/ilyakaznacheev/cleanenv"
 )
 
-// ConfigConf basic structure of configs
-type ConfigConf struct {
-	Mode       string `yaml:"mode" env-default:"dev"`
-	ComDir     string `yaml:"com_dir" env-default:"./com/"`
-	HTTPServer `yaml:"http_server"`
-	TLS        `yaml:"tls"`
-	Internal   `yaml:"internal"`
-	Updates    `yaml:"updates"`
+var ConfigPath string
+
+type CompositorContract interface {
+	LoadEnv() error
+	LoadConf(path string) error
+}
+
+type Compositor struct {
+	Conf *Conf
+	Env  *Env
+}
+
+type Conf struct {
+	Mode       string     `mapstructure:"mode"`
+	ComDir     string     `mapstructure:"com_dir"`
+	HTTPServer HTTPServer `mapstructure:"http_server"`
+	TLS        TLS        `mapstructure:"tls"`
+	Updates    Updates    `mapstructure:"updates"`
 }
 
 type HTTPServer struct {
-	Address        string        `yaml:"address" env-default:"0.0.0.0:8080"`
-	Timeout        time.Duration `yaml:"timeout" env-default:"5s"`
-	IdleTimeout    time.Duration `yaml:"idle_timeout" env-default:"60s"`
-	HTTPServer_Api `yaml:"api"`
+	Address        string         `mapstructure:"address"`
+	Timeout        time.Duration  `mapstructure:"timeout"`
+	IdleTimeout    time.Duration  `mapstructure:"idle_timeout"`
+	HTTPServer_Api HTTPServer_Api `mapstructure:"api"`
 }
 
 type HTTPServer_Api struct {
-	LatestVer string   `yaml:"latest-version" env-required:"true"`
-	Layers    []string `yaml:"layers"`
+	LatestVer string   `mapstructure:"latest-version"`
+	Layers    []string `mapstructure:"layers"`
 }
 
 type TLS struct {
-	TlsEnabled bool   `yaml:"enabled" env-default:"false"`
-	CertFile   string `yaml:"cert_file" env-default:"./cert/server.crt"`
-	KeyFile    string `yaml:"key_file" env-default:"./cert/server.key"`
-}
-
-type Internal struct {
-	MetaDir string `yaml:"meta_dir" env-default:"./.meta/"`
+	TlsEnabled bool   `mapstructure:"enabled"`
+	CertFile   string `mapstructure:"cert_file"`
+	KeyFile    string `mapstructure:"key_file"`
 }
 
 type Updates struct {
-	UpdatesEnabled bool          `yaml:"enabled" env-default:"false"`
-	CheckInterval  time.Duration `yaml:"check_interval" env-default:"2h"`
-	RepositoryURL  string        `yaml:"repository_url" env-default:""`
-	WantedVersion  string        `yaml:"wanted_version" env-default:"latest-stable"`
+	UpdatesEnabled bool          `mapstructure:"enabled"`
+	CheckInterval  time.Duration `mapstructure:"check_interval"`
+	RepositoryURL  string        `mapstructure:"repository_url"`
+	WantedVersion  string        `mapstructure:"wanted_version"`
 }
 
 // ConfigEnv structure for environment variables
-type ConfigEnv struct {
-	ConfigPath string `env:"CONFIG_PATH" env-default:"./cfg/config.yaml"`
-	NodePath   string `env:"NODE_PATH" env-default:"./"`
-}
-
-// MustLoadConfig loads the configuration from the specified path and environment variables.
-// Program will shutdown if any error occurs during loading.
-func MustLoadConfig() *ConfigConf {
-	log.SetOutput(os.Stderr)
-	var configEnv ConfigEnv
-	if err := cleanenv.ReadEnv(&configEnv); err != nil {
-		log.Fatalf("Failed to read environment variables: %v", err)
-		os.Exit(1)
-	}
-	if _, err := os.Stat(configEnv.ConfigPath); os.IsNotExist(err) {
-		log.Fatalf("Config file does not exist: %s", configEnv.ConfigPath)
-		os.Exit(2)
-	}
-	var config ConfigConf
-	if err := cleanenv.ReadConfig(configEnv.ConfigPath, &config); err != nil {
-		log.Fatalf("Failed to read config file: %v", err)
-		os.Exit(3)
-	}
-	log.Printf("Configuration loaded successfully from %s", configEnv.ConfigPath)
-	return &config
+type Env struct {
+	ConfigPath     string `mapstructure:"config_path"`
+	NodePath       string `mapstructure:"node_path"`
+	ParentStagePID int    `mapstructure:"parent_pid"`
 }

core/config/consts.go

@@ -3,7 +3,7 @@ package config
 import "os"
 
 // UUIDLength is uuids length for sessions. By default it is 16 bytes.
-var UUIDLength byte = 16
+var UUIDLength int = 16
 
 // ApiRoute setting for go-chi for main route for api requests
 var ApiRoute string = "/api/{ver}"
@@ -25,6 +25,8 @@ var UpdateArchiveName string = "gosally-node"
 // UpdateInstallPath is the path where the update will be installed.
 var UpdateDownloadPath string = os.TempDir()
 
+var MetaDir string = "./.meta"
+
 type _internalConsts struct{}
 type _serverConsts struct{}
 type _updateConsts struct{}
@@ -40,8 +42,9 @@ func (_ _updateConsts) GetActualFileName() string     { return ActualFileName }
 func (_ _updateConsts) GetUpdateArchiveName() string  { return UpdateArchiveName }
 func (_ _updateConsts) GetUpdateDownloadPath() string { return UpdateDownloadPath }
 
-func GetInternalConsts() _internalConsts      { return _internalConsts{} }
-func (_ _internalConsts) GetUUIDLength() byte { return UUIDLength }
+func GetInternalConsts() _internalConsts     { return _internalConsts{} }
+func (_ _internalConsts) GetUUIDLength() int { return UUIDLength }
+func (_ _internalConsts) GetMetaDir() string { return MetaDir }
 
 func GetServerConsts() _serverConsts           { return _serverConsts{} }
 func (_ _serverConsts) GetApiRoute() string    { return ApiRoute }