mirror of
https://github.com/akyaiy/GoSally-mvp.git
synced 2026-01-03 20:12:25 +00:00
remove some garbage
This commit is contained in:
@@ -1,133 +0,0 @@
|
|||||||
package sv1
|
|
||||||
|
|
||||||
/*
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/akyaiy/GoSally-mvp/core/config"
|
|
||||||
"github.com/akyaiy/GoSally-mvp/core/corestate"
|
|
||||||
"github.com/akyaiy/GoSally-mvp/core/utils"
|
|
||||||
"github.com/go-chi/chi/v5"
|
|
||||||
)
|
|
||||||
|
|
||||||
// The function processes the HTTP request and returns a list of available commands.
|
|
||||||
func (h *HandlerV1) HandleList(w http.ResponseWriter, r *http.Request) {
|
|
||||||
uuid16, err := utils.NewUUID(int(config.UUIDLength))
|
|
||||||
if err != nil {
|
|
||||||
h.log.Error("Failed to generate UUID",
|
|
||||||
slog.String("error", err.Error()))
|
|
||||||
|
|
||||||
if err := utils.WriteJSONError(w, http.StatusInternalServerError, "failed to generate UUID: "+err.Error()); err != nil {
|
|
||||||
h.log.Error("Failed to write JSON", slog.String("err", err.Error()))
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log := h.log.With(
|
|
||||||
slog.Group("request",
|
|
||||||
slog.String("version", h.GetVersion()),
|
|
||||||
slog.String("url", r.URL.String()),
|
|
||||||
slog.String("method", r.Method),
|
|
||||||
),
|
|
||||||
slog.Group("connection",
|
|
||||||
slog.String("connection-uuid", uuid16),
|
|
||||||
slog.String("remote", r.RemoteAddr),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
log.Info("Received request")
|
|
||||||
type ComMeta struct {
|
|
||||||
Description string `json:"Description"`
|
|
||||||
Arguments map[string]string `json:"Arguments,omitempty"`
|
|
||||||
}
|
|
||||||
var (
|
|
||||||
files []os.DirEntry
|
|
||||||
commands = make(map[string]ComMeta)
|
|
||||||
cmdsProcessed = make(map[string]bool)
|
|
||||||
)
|
|
||||||
|
|
||||||
if files, err = os.ReadDir(h.cfg.ComDir); err != nil {
|
|
||||||
log.Error("Failed to read commands directory",
|
|
||||||
slog.String("error", err.Error()))
|
|
||||||
|
|
||||||
if err := utils.WriteJSONError(w, http.StatusInternalServerError, "failed to read commands directory: "+err.Error()); err != nil {
|
|
||||||
h.log.Error("Failed to write JSON", slog.String("err", err.Error()))
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
apiVer := chi.URLParam(r, "ver")
|
|
||||||
|
|
||||||
// Сначала ищем версионные
|
|
||||||
for _, file := range files {
|
|
||||||
if file.IsDir() || filepath.Ext(file.Name()) != ".lua" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
cmdFull := file.Name()[:len(file.Name())-4]
|
|
||||||
cmdParts := strings.SplitN(cmdFull, "?", 2)
|
|
||||||
cmdName := cmdParts[0]
|
|
||||||
|
|
||||||
if !h.allowedCmd.MatchString(string([]rune(cmdName)[0])) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !h.listAllowedCmd.MatchString(cmdName) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(cmdParts) == 2 && cmdParts[1] == apiVer {
|
|
||||||
description, _ := h.extractDescriptionStatic(filepath.Join(h.cfg.ComDir, file.Name()))
|
|
||||||
if description == "" {
|
|
||||||
description = "description missing"
|
|
||||||
}
|
|
||||||
commands[cmdName] = ComMeta{Description: description}
|
|
||||||
cmdsProcessed[cmdName] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Потом фоллбеки
|
|
||||||
for _, file := range files {
|
|
||||||
if file.IsDir() || filepath.Ext(file.Name()) != ".lua" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
cmdFull := file.Name()[:len(file.Name())-4]
|
|
||||||
cmdParts := strings.SplitN(cmdFull, "?", 2)
|
|
||||||
cmdName := cmdParts[0]
|
|
||||||
|
|
||||||
if !h.allowedCmd.MatchString(string([]rune(cmdName)[0])) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !h.listAllowedCmd.MatchString(cmdName) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if cmdsProcessed[cmdName] {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(cmdParts) == 1 {
|
|
||||||
description, _ := h.extractDescriptionStatic(filepath.Join(h.cfg.ComDir, file.Name()))
|
|
||||||
if description == "" {
|
|
||||||
description = "description missing"
|
|
||||||
}
|
|
||||||
commands[cmdName] = ComMeta{Description: description}
|
|
||||||
cmdsProcessed[cmdName] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Debug("Command list prepared")
|
|
||||||
|
|
||||||
log.Info("Session completed")
|
|
||||||
uuid32, _ := corestate.GetNodeUUID(filepath.Join(config.MetaDir, "uuid"))
|
|
||||||
response := ResponseFormat{
|
|
||||||
ResponsibleAgentUUID: uuid32,
|
|
||||||
RequestedCommand: "list",
|
|
||||||
Response: commands,
|
|
||||||
}
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
if err := json.NewEncoder(w).Encode(response); err != nil {
|
|
||||||
h.log.Error("Failed to write JSON error response",
|
|
||||||
slog.String("error", err.Error()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
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"`
|
|
||||||
}
|
|
||||||
@@ -5,29 +5,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
// func (h *HandlerV1) errNotFound(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// utils.WriteJSONError(h.w, http.StatusBadRequest, "invalid request")
|
|
||||||
// h.log.Error("HTTP request error",
|
|
||||||
// slog.String("remote", h.r.RemoteAddr),
|
|
||||||
// slog.String("method", h.r.Method),
|
|
||||||
// slog.String("url", h.r.URL.String()),
|
|
||||||
// slog.Int("status", http.StatusBadRequest))
|
|
||||||
// }
|
|
||||||
|
|
||||||
// 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
|
|
||||||
// }
|
|
||||||
|
|
||||||
func (h *HandlerV1) comMatch(ver string, comName string) string {
|
func (h *HandlerV1) comMatch(ver string, comName string) string {
|
||||||
files, err := os.ReadDir(h.cfg.ComDir)
|
files, err := os.ReadDir(h.cfg.ComDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user