Allow reading data of any size through socket

src/ectl/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -80,24 +81,22 @@ func main() {
 				log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
 			}
 
-			// Create a buffer for incoming data.
-			buf := make([]byte, 4096)
-
 			// Read data from the connection.
-			n, err := conn.Read(buf)
+			data, err := readAllConn(conn)
 			if err != nil {
+				log.Fatalf("Could not read data from socket! Error: %s\n", err)
 				return
 			}
 
 			// Print json data if flag is set
 			if *printJson {
-				fmt.Println(string(buf[:n]))
+				fmt.Println(string(data))
 				return
 			}
 
 			// Decoode JSON data
 			var returnedJsonData map[string]any
-			err = json.Unmarshal(buf[:n], &returnedJsonData)
+			err = json.Unmarshal(data, &returnedJsonData)
 			if err != nil {
 				log.Fatalf("Could not decode JSON data from connection!")
 			}
@@ -138,27 +137,22 @@ func main() {
 				log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
 			}
 
-			// Create a buffer for incoming data.
-			buf := make([]byte, 4096)
-
 			// Read data from the connection.
-			n, err := conn.Read(buf)
+			data, err := readAllConn(conn)
-			if err == io.EOF {
-				return
-			}
 			if err != nil {
+				log.Fatalf("Could not read data from socket! Error: %s\n", err)
 				return
 			}
 
 			// Print json data if flag is set
 			if *printJson {
-				fmt.Println(string(buf[:n]))
+				fmt.Println(string(data))
 				return
 			}
 
 			// Decoode JSON data
 			var returnedJsonData map[string]any
-			err = json.Unmarshal(buf[:n], &returnedJsonData)
+			err = json.Unmarshal(data, &returnedJsonData)
 			if err != nil {
 				log.Fatalf("Could not decode JSON data from connection!")
 			}
@@ -214,27 +208,22 @@ func main() {
 				log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
 			}
 
-			// Create a buffer for incoming data.
-			buf := make([]byte, 4096)
-
 			// Read data from the connection.
-			n, err := conn.Read(buf)
+			data, err := readAllConn(conn)
-			if err == io.EOF {
-				return
-			}
 			if err != nil {
+				log.Fatalf("Could not read data from socket! Error: %s\n", err)
 				return
 			}
 
 			// Print json data if flag is set
 			if *printJson {
-				fmt.Println(string(buf[:n]))
+				fmt.Println(string(data))
 				return
 			}
 
 			// Decoode JSON data
 			var returnedJsonData map[string]any
-			err = json.Unmarshal(buf[:n], &returnedJsonData)
+			err = json.Unmarshal(data, &returnedJsonData)
 			if err != nil {
 				log.Fatalf("Could not decode JSON data from connection!")
 			}
@@ -275,27 +264,22 @@ func main() {
 				log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
 			}
 
-			// Create a buffer for incoming data.
-			buf := make([]byte, 4096)
-
 			// Read data from the connection.
-			n, err := conn.Read(buf)
+			data, err := readAllConn(conn)
-			if err == io.EOF {
-				return
-			}
 			if err != nil {
+				log.Fatalf("Could not read data from socket! Error: %s\n", err)
 				return
 			}
 
 			// Print json data if flag is set
 			if *printJson {
-				fmt.Println(string(buf[:n]))
+				fmt.Println(string(data))
 				return
 			}
 
 			// Decoode JSON data
 			var returnedJsonData map[string]any
-			err = json.Unmarshal(buf[:n], &returnedJsonData)
+			err = json.Unmarshal(data, &returnedJsonData)
 			if err != nil {
 				log.Fatalf("Could not decode JSON data from connection!")
 			}
@@ -305,11 +289,13 @@ func main() {
 			}
 
 			serviceState := returnedJsonData["state"].(string)
+			serviceDescription := returnedJsonData["description"].(string)
 			serviceEnabled := returnedJsonData["is_enabled"].(bool)
 			serviceStage := int(returnedJsonData["stage"].(float64))
 			processID := int(returnedJsonData["process_id"].(float64))
 
 			fmt.Printf("Name: %s\n", flag.Arg(2))
+			fmt.Printf("Description: %s\n", serviceDescription)
 			fmt.Printf("State: %s\n", serviceState)
 			if serviceEnabled {
 				fmt.Printf("Enabled: %t (Stage %d)\n", serviceEnabled, serviceStage)
@@ -340,27 +326,22 @@ func main() {
 				log.Fatalf("Could not write JSON data to socket! Error: %s\n", err)
 			}
 
-			// Create a buffer for incoming data.
-			buf := make([]byte, 4096)
-
 			// Read data from the connection.
-			n, err := conn.Read(buf)
+			data, err := readAllConn(conn)
-			if err == io.EOF {
-				return
-			}
 			if err != nil {
+				log.Fatalf("Could not read data from socket! Error: %s\n", err)
 				return
 			}
 
 			// Print json data if flag is set
 			if *printJson {
-				fmt.Println(string(buf[:n]))
+				fmt.Println(string(data))
 				return
 			}
 
 			// Decoode JSON data
 			var returnedJsonData map[string]any
-			err = json.Unmarshal(buf[:n], &returnedJsonData)
+			err = json.Unmarshal(data, &returnedJsonData)
 			if err != nil {
 				log.Fatalf("Could not decode JSON data from connection!")
 			}
@@ -371,12 +352,14 @@ func main() {
 
 			for _, serviceMap := range returnedJsonData["services"].([]any) {
 				serviceName := serviceMap.(map[string]any)["name"].(string)
+				serviceDescription := serviceMap.(map[string]any)["description"].(string)
 				serviceState := serviceMap.(map[string]any)["state"].(string)
 				serviceEnabled := serviceMap.(map[string]any)["is_enabled"].(bool)
 				serviceStage := int(serviceMap.(map[string]any)["stage"].(float64))
 				processID := int(serviceMap.(map[string]any)["process_id"].(float64))
 
 				fmt.Printf("Name: %s\n", serviceName)
+				fmt.Printf("Description: %s\n", serviceDescription)
 				fmt.Printf("State: %s\n", serviceState)
 				if serviceEnabled {
 					fmt.Printf("Enabled: %t (Stage %d)\n", serviceEnabled, serviceStage)
@@ -426,3 +409,24 @@ func dialSocket() {
 		log.Fatalf("Failed to set write deadline! Error: %s\n", err)
 	}
 }
+
+func readAllConn(conn net.Conn) ([]byte, error) {
+	var buf bytes.Buffer
+
+	for {
+		dataChunk := make([]byte, 1024)
+
+		n, err := conn.Read(dataChunk)
+		if err != nil && err != io.EOF {
+			return nil, err
+		}
+
+		buf.Write(dataChunk[:n])
+
+		if n < 1024 {
+			break
+		}
+	}
+
+	return buf.Bytes(), nil
+}

src/esvm/main.go

@@ -146,7 +146,6 @@ func Init() {
 			service := EnitService{
 				Name:             "",
 				Description:      "",
-				Dependencies:     make([]string, 0),
 				Type:             "",
 				StartCmd:         "",
 				ExitMethod:       "",
@@ -199,7 +198,7 @@ func Init() {
 	}
 
 	// Read enabled services
-	ReadEnabledServices()
+	EnabledServices := ReadEnabledServices()
 
 	// Start enabled services
 	stages := slices.Collect(maps.Keys(EnabledServices))
@@ -217,7 +216,6 @@ func Init() {
 					continue
 				}
 
-				if len(service.GetUnmetDependencies()) == 0 {
 				err := service.StartService()
 				if err != nil {
 					logger.Printf("Error: could not start service (%s): %s", service.Name, err)
@@ -226,7 +224,6 @@ func Init() {
 			}
 		}
 	}
-	}
 
 	logger.Println("ESVM initialized successfully!")
 }

src/esvm/service.go

@@ -40,7 +40,6 @@ var EnitServiceStateNames map[EnitServiceState]string = map[EnitServiceState]str
 type EnitService struct {
 	Name             string `yaml:"name"`
 	Description      string `yaml:"description,omitempty"`
-	Dependencies     []string `yaml:"dependencies,omitempty"`
 	Type             string `yaml:"type"`
 	StartCmd         string `yaml:"start_cmd"`
 	ExitMethod       string `yaml:"exit_method"`
@@ -60,28 +59,8 @@ type EnitService struct {
 }
 
 var Services = make([]*EnitService, 0)
-var EnabledServices = make(map[int][]string)
 var startedServicesOrder = make([]string, 0)
 
-func (service *EnitService) GetUnmetDependencies() (missingDependencies []string) {
-	for _, dependency := range service.Dependencies {
-		if strings.HasPrefix(dependency, "/") {
-			// File dependency
-			if _, err := os.Stat(dependency); err != nil {
-				missingDependencies = append(missingDependencies, dependency)
-			}
-		} else {
-			// Service dependency
-			depService := GetServiceByName(dependency)
-			if depService == nil {
-				missingDependencies = append(missingDependencies, dependency)
-			}
-		}
-	}
-
-	return missingDependencies
-}
-
 func (service *EnitService) GetProcess() *os.Process {
 	process, _ := os.FindProcess(service.processID)
 
@@ -152,7 +131,6 @@ func (service *EnitService) ReloadService() {
 	newService := EnitService{
 		Name:             "",
 		Description:      "",
-		Dependencies:     make([]string, 0),
 		Type:             "",
 		StartCmd:         "",
 		ExitMethod:       "",
@@ -446,10 +424,8 @@ func (service *EnitService) RestartService() error {
 	return nil
 }
 
-// Functions will be rewritten at some point to allow enabling unloaded services
-
 func (service *EnitService) isEnabled() (bool, int) {
-	for stage, services := range EnabledServices {
+	for stage, services := range ReadEnabledServices() {
 		if slices.Contains(services, service.Name) {
 			return true, stage
 		}
@@ -467,6 +443,8 @@ func (service *EnitService) SetEnabled(stage int) error {
 		return nil
 	}
 
+	EnabledServices := ReadEnabledServices()
+
 	// Remove service from current stage
 	EnabledServices[s] = slices.DeleteFunc(EnabledServices[s], func(name string) bool {
 		return name == service.Name
@@ -493,10 +471,12 @@ func (service *EnitService) SetEnabled(stage int) error {
 	return nil
 }
 
-func ReadEnabledServices() error {
+func ReadEnabledServices() (EnabledServices map[int][]string) {
+	EnabledServices = make(map[int][]string)
+
 	data, err := os.ReadFile(path.Join(serviceConfigDir, "enabled_services"))
 	if err != nil {
-		return err
+		return EnabledServices
 	}
 
 	err = yaml.Unmarshal(data, &EnabledServices)
@@ -509,15 +489,15 @@ func ReadEnabledServices() error {
 		// Update enabled_services file
 		data, err := yaml.Marshal(EnabledServices)
 		if err != nil {
-			return err
+			return EnabledServices
 		}
 		err = os.WriteFile(path.Join(serviceConfigDir, "enabled_services"), data, 0644)
 		if err != nil {
-			return err
+			return EnabledServices
 		}
 
-		return nil
+		return EnabledServices
 	}
 
-	return nil
+	return EnabledServices
 }

src/esvm/socket.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -32,27 +33,23 @@ func listenToSocket() {
 	conn, err := socket.Accept()
 	if err != nil {
 		logger.Println("Could not accept socket connection!")
-		panic(err)
+		return
 	}
 
 	// Handle the connection in a separate goroutine.
 	go func(conn net.Conn) {
 		defer conn.Close()
-		// Create a buffer for incoming data.
-		buf := make([]byte, 4096)
 
 		// Read data from the connection.
-		n, err := conn.Read(buf)
+		data, err := readAllConn(conn)
-		if err == io.EOF {
-			return
-		}
 		if err != nil {
+			logger.Fatalf("Could not read data from socket! Error: %s\n", err)
 			return
 		}
 
 		// Decoode JSON data
 		var jsonData map[string]any
-		err = json.Unmarshal(buf[:n], &jsonData)
+		err = json.Unmarshal(data, &jsonData)
 		if err != nil {
 			conn.Write(wrapErrorInJson(fmt.Errorf("Invalid JSON")))
 			return
@@ -230,6 +227,7 @@ func handleStatusServiceCommand(conn net.Conn, jsonData map[string]any) {
 
 	statusMap := make(map[string]any)
 	statusMap["name"] = service.Name
+	statusMap["description"] = service.Description
 	statusMap["state"] = EnitServiceStateNames[service.state]
 	statusMap["process_id"] = service.processID
 	statusMap["is_enabled"], statusMap["stage"] = service.isEnabled()
@@ -252,6 +250,7 @@ func handleListServicesCommand(conn net.Conn, _ map[string]any) {
 	for _, service := range Services {
 		statusMap := make(map[string]any)
 		statusMap["name"] = service.Name
+		statusMap["description"] = service.Description
 		statusMap["state"] = EnitServiceStateNames[service.state]
 		statusMap["process_id"] = service.processID
 		statusMap["is_enabled"], statusMap["stage"] = service.isEnabled()
@@ -301,3 +300,24 @@ func wrapSuccessMsgInJson(msg string) []byte {
 	}
 	return jsonData
 }
+
+func readAllConn(conn net.Conn) ([]byte, error) {
+	var buf bytes.Buffer
+
+	for {
+		dataChunk := make([]byte, 1024)
+
+		n, err := conn.Read(dataChunk)
+		if err != nil && err != io.EOF {
+			return nil, err
+		}
+
+		buf.Write(dataChunk[:n])
+
+		if n < 1024 {
+			break
+		}
+	}
+
+	return buf.Bytes(), nil
+}