Initial commit: not functional

core/config/config.go

@@ -24,6 +24,7 @@ type Conf struct {
 	TLS        TLS        `mapstructure:"tls"`
 	Updates    Updates    `mapstructure:"updates"`
 	Log        Log        `mapstructure:"log"`
+	DisableWarnings []string `mapstructure:"disable_warnings"`
 }
 
 type HTTPServer struct {

core/general_server/handle_multi.go

@@ -14,20 +14,19 @@
 package general_server
 
 import (
+	"encoding/json"
 	"errors"
+	"io"
 	"log/slog"
 	"net/http"
-	"slices"
 
 	"github.com/akyaiy/GoSally-mvp/core/config"
-	"github.com/akyaiy/GoSally-mvp/core/utils"
-
-	"github.com/go-chi/chi/v5"
 )
 
 // serversApiVer is a type alias for string, used to represent API version strings in the GeneralServer.
 type serversApiVer string
 
+/*
 // GeneralServerApiContract defines the interface for servers that can be registered
 type GeneralServerApiContract interface {
 	// GetVersion returns the API version of the server.
@@ -37,9 +36,13 @@ type GeneralServerApiContract interface {
 	Handle(w http.ResponseWriter, r *http.Request)
 	HandleList(w http.ResponseWriter, r *http.Request)
 }
+*/
+
+type GeneralServerApiContract interface {
+	GetVersion() string
+	Handle(w http.ResponseWriter, r *http.Request)
+}
 
-// GeneralServerContarct extends the GeneralServerApiContract with a method to append new servers.
-// This interface is only for general server initialization and does not need to be implemented by individual servers.
 type GeneralServerContarct interface {
 	GeneralServerApiContract
 	// AppendToArray adds a new server to the GeneralServer's internal map.
@@ -61,7 +64,7 @@ type GeneralServer struct {
 
 // GeneralServerInit structure only for initialization general server.
 type GeneralServerInit struct {
-	Log    slog.Logger
+	Log    *slog.Logger
 	Config *config.Conf
 }
 
@@ -70,7 +73,7 @@ func InitGeneral(o *GeneralServerInit, servers ...GeneralServerApiContract) *Gen
 	general := &GeneralServer{
 		servers: make(map[serversApiVer]GeneralServerApiContract),
 		cfg:     o.Config,
-		log:     o.Log,
+		log:     *o.Log,
 	}
 
 	// register the provided servers
@@ -95,6 +98,62 @@ func (s *GeneralServer) AppendToArray(server GeneralServerApiContract) error {
 	return errors.New("server with this version is already exist")
 }
 
+func (s *GeneralServer) Handle(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
+		WriteRouterError(w, &RouterError{
+			Status:     "error",
+			StatusCode: http.StatusBadRequest,
+			Payload: map[string]any{
+				"Message": IssueMethod,
+			},
+		})
+		s.log.Info("invalid request received", slog.String("issue", IssueMethod), slog.String("requested-method", r.Method))
+		return
+	}
+	var payload RawPettiEnvelope
+
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		WriteRouterError(w, &RouterError{
+			Status:     "error",
+			StatusCode: http.StatusBadRequest,
+			Payload: map[string]any{
+				"Message": IssueToReadBody,
+			},
+		})
+		s.log.Info("invalid request received", slog.String("issue", IssueToReadBody))
+		return
+	}
+
+	if err := json.Unmarshal(body, &payload); err != nil {
+		WriteRouterError(w, &RouterError{
+			Status:     "error",
+			StatusCode: http.StatusBadRequest,
+			Payload: map[string]any{
+				"Message": InvalidProtocol,
+			},
+		})
+		s.log.Info("invalid request received", slog.String("issue", InvalidProtocol))
+		return
+	}
+
+	server, ok := s.servers[serversApiVer(payload.PettiVer)]
+	if !ok {
+		WriteRouterError(w, &RouterError{
+			Status:     "error",
+			StatusCode: http.StatusBadRequest,
+			Payload: map[string]any{
+				"Message": InvalidProtovolVersion,
+			},
+		})
+		s.log.Info("invalid request received", slog.String("issue", InvalidProtovolVersion), slog.String("requested-version", payload.PettiVer))
+		return
+	}
+
+	server.Handle(w, r)
+}
+
+/*
 // Handle processes incoming HTTP requests, routing them to the appropriate server based on the API version.
 // It checks if the requested version is registered and handles the request accordingly.
 func (s *GeneralServer) Handle(w http.ResponseWriter, r *http.Request) {
@@ -188,3 +247,4 @@ func (s *GeneralServer) HandleList(w http.ResponseWriter, r *http.Request) {
 		s.log.Error("Failed to write JSON", slog.String("err", err.Error()))
 	}
 }
+*/

core/general_server/issue.go

@@ -0,0 +1,8 @@
+package general_server
+
+const (
+	IssueMethod            = "invalid request method"
+	IssueToReadBody        = "unable to read body"
+	InvalidProtocol        = "unknown protocol or missing PettiVer field"
+	InvalidProtovolVersion = "unsupported PETTI version"
+)

core/general_server/protocol.go

@@ -0,0 +1,49 @@
+package general_server
+
+import (
+	"encoding/json"
+	"net/http"
+)
+
+type RawPettiEnvelope struct {
+	PettiVer string `json:"PettiVer"`
+}
+
+type RouterError struct {
+	Status     string         `json:"Status"`
+	StatusCode int            `json:"StatusCode"`
+	Payload    map[string]any `json:"Payload"`
+}
+
+func WriteRouterError(w http.ResponseWriter, e *RouterError) error {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(e.StatusCode)
+
+	data, err := json.Marshal(e)
+	if err != nil {
+		return err
+	}
+
+	_, err = w.Write(data)
+	return err
+}
+
+// func WriteRouterError(w http.ResponseWriter, e *RouterError) error {
+// 	resp := RouterError{
+// 		Status:     e.Status,
+// 		StatusCode: e.StatusCode,
+// 		Payload:    e.Payload,
+// 	}
+// 	b, err := json.Marshal(resp)
+// 	if err != nil {
+// 		return err
+// 	}
+// 	var formatted bytes.Buffer
+// 	if err := json.Indent(&formatted, b, "", "  "); err != nil {
+// 		return err
+// 	}
+// 	w.Header().Set("Content-Type", "application/json")
+// 	w.WriteHeader(e.StatusCode)
+// 	formatted.WriteTo(w)
+// 	return nil
+// }

core/sv1/handle.go

@@ -1,5 +1,168 @@
 package sv1
 
+import (
+	"encoding/json"
+	"log/slog"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/akyaiy/GoSally-mvp/core/config"
+	"github.com/akyaiy/GoSally-mvp/core/corestate"
+	"github.com/akyaiy/GoSally-mvp/core/utils"
+	lua "github.com/yuin/gopher-lua"
+)
+
+
+
+// func (h *HandlerV1) Handle(w http.ResponseWriter, r *http.Request) {
+// 	var req PettiRequest
+// 	// server, ok := s.servers[serversApiVer(payload.PettiVer)]
+// 	// if !ok {
+// 	// 	WriteRouterError(w, &RouterError{
+// 	// 		Status:     "error",
+// 	// 		StatusCode: http.StatusBadRequest,
+// 	// 		Payload: map[string]any{
+// 	// 			"Message": InvalidProtovolVersion,
+// 	// 		},
+// 	// 	})
+// 	// 	s.log.Info("invalid request received", slog.String("issue", InvalidProtovolVersion), slog.String("requested-version", payload.PettiVer))
+// 	// 	return
+// 	// }
+// 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "невалидный JSON: "+err.Error())
+// 		return
+// 	}
+
+// 	if req.PettiVer == "" {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "отсутствует PettiVer")
+// 		return
+// 	}
+// 	if req.PettiVer != h.GetVersion() {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "неподдерживаемая версия PettiVer")
+// 		return
+// 	}
+// 	if req.PackageType.Request == "" {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "отсутствует PackageType.Request")
+// 		return
+// 	}
+// 	if req.Payload == nil {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "отсутствует Payload")
+// 		return
+// 	}
+// 	cmdRaw, ok := req.Payload["Exec"].(string)
+// 	if !ok || cmdRaw == "" {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "Payload.Exec отсутствует или некорректен")
+// 		return
+// 	}
+// 	cmd := cmdRaw
+
+// 	if !h.allowedCmd.MatchString(string([]rune(cmd)[0])) || !h.listAllowedCmd.MatchString(cmd) {
+// 		utils.WriteJSONError(w, http.StatusBadRequest, "команда запрещена")
+// 		return
+// 	}
+
+// 	// ===== Проверка скрипта
+// 	scriptPath := h.comMatch(h.GetVersion(), cmd)
+// 	if scriptPath == "" {
+// 		utils.WriteJSONError(w, http.StatusNotFound, "команда не найдена")
+// 		return
+// 	}
+// 	fullPath := filepath.Join(h.cfg.ComDir, scriptPath)
+// 	if _, err := os.Stat(fullPath); err != nil {
+// 		utils.WriteJSONError(w, http.StatusNotFound, "файл команды не найден")
+// 		return
+// 	}
+
+// 	// ===== Запуск Lua
+// 	L := lua.NewState()
+// 	defer L.Close()
+
+// 	inTable := L.NewTable()
+// 	paramsTable := L.NewTable()
+// 	if params, ok := req.Payload["PassedParameters"].(map[string]interface{}); ok {
+// 		for k, v := range params {
+// 			L.SetField(paramsTable, k, utils.ConvertGolangTypesToLua(L, v))
+// 		}
+// 	}
+// 	L.SetField(inTable, "Params", paramsTable)
+// 	L.SetGlobal("In", inTable)
+
+// 	resultTable := L.NewTable()
+// 	outTable := L.NewTable()
+// 	L.SetField(outTable, "Result", resultTable)
+// 	L.SetGlobal("Out", outTable)
+
+// 	prepareLua := filepath.Join(h.cfg.ComDir, "_prepare.lua")
+// 	if _, err := os.Stat(prepareLua); err == nil {
+// 		if err := L.DoFile(prepareLua); err != nil {
+// 			utils.WriteJSONError(w, http.StatusInternalServerError, "lua _prepare ошибка: "+err.Error())
+// 			return
+// 		}
+// 	}
+// 	if err := L.DoFile(fullPath); err != nil {
+// 		utils.WriteJSONError(w, http.StatusInternalServerError, "lua exec ошибка: "+err.Error())
+// 		return
+// 	}
+
+// 	lv := L.GetGlobal("Out")
+// 	tbl, ok := lv.(*lua.LTable)
+// 	if !ok {
+// 		utils.WriteJSONError(w, http.StatusInternalServerError, "'Out' не таблица")
+// 		return
+// 	}
+// 	resultVal := tbl.RawGetString("Result")
+// 	resultTbl, ok := resultVal.(*lua.LTable)
+// 	if !ok {
+// 		utils.WriteJSONError(w, http.StatusInternalServerError, "'Result' не таблица")
+// 		return
+// 	}
+
+// 	out := make(map[string]any)
+// 	resultTbl.ForEach(func(key lua.LValue, value lua.LValue) {
+// 		out[key.String()] = utils.ConvertLuaTypesToGolang(value)
+// 	})
+
+// 	uuid32, _ := corestate.GetNodeUUID(filepath.Join(config.MetaDir, "uuid"))
+
+// 	resp := PettiResponse{
+// 		PettiVer:             req.PettiVer,
+// 		ResponsibleAgentUUID: uuid32,
+// 		PackageType: struct {
+// 			AnswerOf string `json:"AnswerOf"`
+// 		}{AnswerOf: req.PackageType.Request},
+// 		Payload: map[string]any{
+// 			"RequestedCommand": cmd,
+// 			"Response":         out,
+// 		},
+// 	}
+
+// 	// ===== Финальная проверка на сериализацию (валидность сборки)
+// 	respData, err := json.Marshal(resp)
+// 	if err != nil {
+// 		utils.WriteJSONError(w, http.StatusInternalServerError, "внутренняя ошибка: пакет невалиден")
+// 		return
+// 	}
+
+// 	w.Header().Set("Content-Type", "application/json")
+// 	w.WriteHeader(http.StatusOK)
+// 	if _, err := w.Write(respData); err != nil {
+// 		h.log.Error("Ошибка при отправке JSON", slog.String("err", err.Error()))
+// 	}
+
+// 	// ===== Логгирование статуса
+// 	status, _ := out["status"].(string)
+// 	switch status {
+// 	case "ok":
+// 		h.log.Info("Успешно", slog.String("cmd", cmd), slog.Any("out", out))
+// 	case "error":
+// 		h.log.Warn("Ошибка в команде", slog.String("cmd", cmd), slog.Any("out", out))
+// 	default:
+// 		h.log.Info("Неизвестный статус", slog.String("cmd", cmd), slog.Any("out", out))
+// 	}
+// }
+
+/*
 import (
 	"encoding/json"
 	"log/slog"
@@ -181,3 +344,4 @@ func (h *HandlerV1) Handle(w http.ResponseWriter, r *http.Request) {
 
 	log.Info("Session completed")
 }
+*/

core/sv1/handle_list.go

@@ -1,5 +1,6 @@
 package sv1
 
+/*
 import (
 	"encoding/json"
 	"log/slog"
@@ -129,3 +130,4 @@ func (h *HandlerV1) HandleList(w http.ResponseWriter, r *http.Request) {
 			slog.String("error", err.Error()))
 	}
 }
+*/

core/sv1/petti.go

@@ -0,0 +1,20 @@
+package sv1
+
+// PETTI - Go Sally Protocol for Exchanging Technical Tasks and Information
+
+type PettiRequest struct {
+	PettiVer    string `json:"PettiVer"`
+	PackageType struct {
+		Request string `json:"Request"`
+	} `json:"PackageType"`
+	Payload map[string]any `json:"Payload"`
+}
+
+type PettiResponse struct {
+	PettiVer    string `json:"PettiVer"`
+	PackageType struct {
+		AnswerOf string `json:"AnswerOf"`
+	} `json:"PackageType"`
+	ResponsibleAgentUUID string         `json:"ResponsibleAgentUUID"`
+	Payload              map[string]any `json:"Payload"`
+}

core/sv1/proto.go

@@ -1,7 +0,0 @@
-package sv1
-
-type ResponseFormat struct {
-	ResponsibleAgentUUID string
-	RequestedCommand     string
-	Response             any
-}

core/sv1/utils.go

@@ -3,7 +3,6 @@ package sv1
 import (
 	"log/slog"
 	"os"
-	"regexp"
 )
 
 // func (h *HandlerV1) errNotFound(w http.ResponseWriter, r *http.Request) {
@@ -15,19 +14,19 @@ import (
 // 		slog.Int("status", http.StatusBadRequest))
 // }
 
-func (h *HandlerV1) extractDescriptionStatic(path string) (string, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return "", err
-	}
+// func (h *HandlerV1) extractDescriptionStatic(path string) (string, error) {
+// 	data, err := os.ReadFile(path)
+// 	if err != nil {
+// 		return "", err
+// 	}
 
-	re := regexp.MustCompile(`---\s*#description\s*=\s*"([^"]+)"`)
-	m := re.FindStringSubmatch(string(data))
-	if len(m) <= 0 {
-		return "", nil
-	}
-	return m[1], nil
-}
+// 	re := regexp.MustCompile(`---\s*#description\s*=\s*"([^"]+)"`)
+// 	m := re.FindStringSubmatch(string(data))
+// 	if len(m) <= 0 {
+// 		return "", nil
+// 	}
+// 	return m[1], nil
+// }
 
 func (h *HandlerV1) comMatch(ver string, comName string) string {
 	files, err := os.ReadDir(h.cfg.ComDir)

core/utils/internal_lua.go

@@ -1,6 +1,10 @@
 package utils
 
-import lua "github.com/yuin/gopher-lua"
+import (
+	"fmt"
+
+	lua "github.com/yuin/gopher-lua"
+)
 
 func ConvertLuaTypesToGolang(value lua.LValue) any {
 	switch value.Type() {
@@ -11,16 +15,64 @@ func ConvertLuaTypesToGolang(value lua.LValue) any {
 	case lua.LTBool:
 		return bool(value.(lua.LBool))
 	case lua.LTTable:
-		result := make(map[string]interface{})
-		if tbl, ok := value.(*lua.LTable); ok {
-			tbl.ForEach(func(key lua.LValue, value lua.LValue) {
-				result[key.String()] = ConvertLuaTypesToGolang(value)
-			})
+		tbl := value.(*lua.LTable)
+
+		// Попробуем как массив
+		var arr []any
+		isArray := true
+		tbl.ForEach(func(key, val lua.LValue) {
+			if key.Type() != lua.LTNumber {
+				isArray = false
+			}
+			arr = append(arr, ConvertLuaTypesToGolang(val))
+		})
+
+		if isArray {
+			return arr
 		}
+
+		result := make(map[string]any)
+		tbl.ForEach(func(key, val lua.LValue) {
+			result[key.String()] = ConvertLuaTypesToGolang(val)
+		})
 		return result
+
 	case lua.LTNil:
 		return nil
 	default:
 		return value.String()
 	}
 }
+
+func ConvertGolangTypesToLua(L *lua.LState, val any) lua.LValue {
+	switch v := val.(type) {
+	case string:
+		return lua.LString(v)
+	case bool:
+		return lua.LBool(v)
+	case int:
+		return lua.LNumber(float64(v))
+	case int64:
+		return lua.LNumber(float64(v))
+	case float32:
+		return lua.LNumber(float64(v))
+	case float64:
+		return lua.LNumber(v)
+	case []any:
+		tbl := L.NewTable()
+		for i, item := range v {
+			tbl.RawSetInt(i+1, ConvertGolangTypesToLua(L, item))
+		}
+		return tbl
+	case map[string]any:
+		tbl := L.NewTable()
+		for key, value := range v {
+			tbl.RawSetString(key, ConvertGolangTypesToLua(L, value))
+		}
+		return tbl
+	case nil:
+		return lua.LNil
+	default:
+		return lua.LString(fmt.Sprintf("%v", v))
+	}
+}