Compare commits

7 Commits

Author SHA1 Message Date
d4413c433f fmt 2025-11-02 11:04:12 +02:00
d9a4bb7871 fix fmt 2025-11-02 10:17:49 +02:00
8e017af3ed change sv1 version 2025-11-01 10:22:14 +02:00
ef6023330d 2025-10-22 15:05:12 +03:00
5474b22fc8 Update README.md 2025-10-12 13:11:55 +03:00
6cd678d9f1 Update README.md 2025-10-12 13:10:10 +03:00
856d3b418c Update README.md 2025-10-12 13:06:37 +03:00
13 changed files with 214 additions and 93 deletions

View File

@@ -55,30 +55,22 @@ pure-run:
exec ./$(BIN_DIR)/$(APP_NAME) exec ./$(BIN_DIR)/$(APP_NAME)
test: test:
@go test ./... | grep -v '^?' || true @cd src && go test ./... | grep -v '^?' || true
fmt: fmt:
@go fmt ./internal/./... @cd src && go fmt .
@go fmt ./cmd/./... @cd src && $(GOPATH)/bin/goimports -w .
@go fmt ./hooks/./...
@$(GOPATH)/bin/goimports -w ./internal/
@$(GOPATH)/bin/goimports -w ./cmd/
@$(GOPATH)/bin/goimports -w ./hooks/
vet: vet:
@go vet ./... @cd src && go vet ./...
lint:
@$(GOPATH)/bin/golangci-lint run
check: fmt vet lint test check: fmt vet lint test
lint:
licenses: @cd src && $(GOPATH)/bin/golangci-lint run ./...
@$(GOPATH)/bin/go-licenses save ./... --save_path=third_party/licenses --force @$(GOPATH)/bin/go-licenses save ./... --save_path=third_party/licenses --force
@echo "Licenses have been exported to third_party/licenses" @echo "Licenses have been exported to third_party/licenses"
clean: licenses:
@rm -rf bin @cd src && $(GOPATH)/bin/go-licenses save ./... --save_path=../third_party/licenses --force
@echo "Licenses have been exported to third_party/licenses"
help: help:
@echo "Available commands: $$(cat Makefile | grep -E '^[a-zA-Z_-]+:.*?' | grep -v -- '-setup:' | sed 's/:.*//g' | sort | uniq | tr '\n' ' ')" @echo "Available commands: $$(cat Makefile | grep -E '^[a-zA-Z_-]+:.*?' | grep -v -- '-setup:' | sed 's/:.*//g' | sort | uniq | tr '\n' ' ')"

View File

@@ -1,9 +1,15 @@
# Go Sally MVP (Minimum/Minimal Viable Product) # Go Sally MVP (Minimum/Minimal Viable Product)
[![Status](https://img.shields.io/badge/status-MVP-orange.svg)]() [![Status](https://img.shields.io/badge/status-MVP-orange.svg)]()
[![Go Version](https://img.shields.io/badge/Go-1.24.6-informational)](https://go.dev/) [![Go Version](https://img.shields.io/badge/Go-1.24.6-informational)](https://go.dev/)
[![Lua Version](https://img.shields.io/badge/Lua-5.1-informational)](https://www.lua.org/manual/5.1/)
[![Go Reference](https://pkg.go.dev/badge/github.com/akyaiy/GoSally-mvp.svg)](https://pkg.go.dev/github.com/akyaiy/GoSally-mvp) [![Go Reference](https://pkg.go.dev/badge/github.com/akyaiy/GoSally-mvp.svg)](https://pkg.go.dev/github.com/akyaiy/GoSally-mvp)
[![License](https://img.shields.io/badge/license-BSD--3--Clause-blue)](LICENSE) [![License](https://img.shields.io/badge/license-BSD--3--Clause-blue)](LICENSE)
[![Last Commit](https://img.shields.io/github/last-commit/akyaiy/GoSally-mvp)]()
[![Commits per month](https://img.shields.io/github/commit-activity/m/akyaiy/GoSally-mvp)]()
[![Docs](https://img.shields.io/badge/docs-wiki-blue)](https://github.com/akyaiy/GoSally-mvp/wiki)
> ⚡ **What, Why, Why Care?** > ⚡ **What, Why, Why Care?**
> **What:** Go Sally is a lightweight decentralized node system with Lua scripting and JSON-RPC2.0. > **What:** Go Sally is a lightweight decentralized node system with Lua scripting and JSON-RPC2.0.
@@ -12,6 +18,15 @@
> **Why Care:** Create, automate, and expand your infrastructure quickly, without unnecessary software or dependencies. > **Why Care:** Create, automate, and expand your infrastructure quickly, without unnecessary software or dependencies.
## Navigation
* [Core features](#core-features)
* [Quick start](#quick-start)
* [Test it](#test-it)
* [Concept](#concept)
* [API](#api)
* [License](#license)
* [Wiki →](https://github.com/akyaiy/GoSally-mvp/wiki)
> [!NOTE] > [!NOTE]
> If you see "💡" in the text, it means the information below is about plans for the future of the project. > If you see "💡" in the text, it means the information below is about plans for the future of the project.

22
com/Access/_common.lua Normal file
View File

@@ -0,0 +1,22 @@
-- File com/Access/_common.lua
--
-- Created at 2025-21-10
--
-- Description:
--- Common functions for Unit module
local common = {}
function common.CheckMissingElement(arr, cmp)
local is_missing = {}
local ok = true
for _, key in ipairs(arr) do
if cmp[key] == nil then
table.insert(is_missing, key)
ok = false
end
end
return ok, is_missing
end
return common

30
com/Access/_errors.lua Normal file
View File

@@ -0,0 +1,30 @@
-- File com/Access/_errors.lua
--
-- Created at 2025-21-10
-- Description:
--- Centralized error definitions for Access operations
--- to keep API responses consistent and clean.
local errors = {
-- Common validation
MISSING_PARAMS = { code = -32602, message = "Missing params" },
INVALID_FIELD_TYPE = { code = -32602, message = "'fields' must be a non-empty table" },
INVALID_BY_PARAM = { code = -32602, message = "Invalid 'by' param" },
NO_VALID_FIELDS = { code = -32604, message = "No valid fields to update" },
-- Existence / duplication
UNIT_NOT_FOUND = { code = -32102, message = "Unit is not exists" },
UNIT_EXISTS = { code = -32101, message = "Unit is already exists" },
-- Database & constraint
UNIQUE_CONSTRAINT = { code = -32602, message = "Unique constraint failed" },
DB_QUERY_FAILED = { code = -32001, message = "Database query failed" },
DB_EXEC_FAILED = { code = -32002, message = "Database execution failed" },
DB_INSERT_FAILED = { code = -32003, message = "Failed to create unit" },
DB_DELETE_FAILED = { code = -32004, message = "Failed to delete unit" },
-- Generic fallback
UNKNOWN = { code = -32099, message = "Unexpected internal error" },
}
return errors

View File

@@ -11,8 +11,8 @@ import (
"regexp" "regexp"
"time" "time"
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
"github.com/akyaiy/GoSally-mvp/src/internal/colors" "github.com/akyaiy/GoSally-mvp/src/internal/colors"
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
"github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager" "github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager"
"github.com/akyaiy/GoSally-mvp/src/internal/core/update" "github.com/akyaiy/GoSally-mvp/src/internal/core/update"
"github.com/akyaiy/GoSally-mvp/src/internal/core/utils" "github.com/akyaiy/GoSally-mvp/src/internal/core/utils"
@@ -22,6 +22,7 @@ import (
"github.com/akyaiy/GoSally-mvp/src/internal/server/gateway" "github.com/akyaiy/GoSally-mvp/src/internal/server/gateway"
"github.com/akyaiy/GoSally-mvp/src/internal/server/session" "github.com/akyaiy/GoSally-mvp/src/internal/server/session"
"github.com/akyaiy/GoSally-mvp/src/internal/server/sv1" "github.com/akyaiy/GoSally-mvp/src/internal/server/sv1"
"github.com/akyaiy/GoSally-mvp/src/internal/server/sv2"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/cors" "github.com/go-chi/cors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@@ -65,13 +66,20 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
Ver: "v1", Ver: "v1",
}) })
sv2 := sv2.InitServer(&sv2.HandlerInitStruct{
X: x,
CS: cs,
AllowedCmd: regexp.MustCompile(AllowedCmdPattern),
Ver: "v2",
})
session_manager := session.New(*x.Config.Conf.HTTPServer.SessionTTL) session_manager := session.New(*x.Config.Conf.HTTPServer.SessionTTL)
s := gateway.InitGateway(&gateway.GatewayServerInit{ s := gateway.InitGateway(&gateway.GatewayServerInit{
SM: session_manager, SM: session_manager,
CS: cs, CS: cs,
X: x, X: x,
}, serverv1) }, serverv1, sv2)
r := chi.NewRouter() r := chi.NewRouter()
r.Use(cors.Handler(cors.Options{ r.Use(cors.Handler(cors.Options{

View File

@@ -11,13 +11,12 @@ import (
type LuaEngineDeps struct { type LuaEngineDeps struct {
HttpRequest *http.Request HttpRequest *http.Request
JSONRPCRequest *rpc.RPCRequest JSONRPCRequest *rpc.RPCRequest
SessionUUID string SessionUUID string
ScriptPath string ScriptPath string
} }
type LuaEngineContract interface { type LuaEngineContract interface {
Handle(deps *LuaEngineDeps) *rpc.RPCResponse Handle(deps *LuaEngineDeps) *rpc.RPCResponse
} }
type LuaEngine struct { type LuaEngine struct {

View File

@@ -80,10 +80,10 @@ func loadDBMod(llog *slog.Logger, sid string) func(*lua.LState) int {
mt := L.NewTypeMetatable("gosally_db") mt := L.NewTypeMetatable("gosally_db")
L.SetField(mt, "__index", L.SetFuncs(L.NewTable(), map[string]lua.LGFunction{ L.SetField(mt, "__index", L.SetFuncs(L.NewTable(), map[string]lua.LGFunction{
"exec": dbExec, "exec": dbExec,
"query": dbQuery, "query": dbQuery,
"query_row": dbQueryRow, "query_row": dbQueryRow,
"close": dbClose, "close": dbClose,
})) }))
L.SetField(dbMod, "__seed", lua.LString(sid)) L.SetField(dbMod, "__seed", lua.LString(sid))
@@ -215,43 +215,43 @@ func dbExec(L *lua.LState) int {
} }
func dbQueryRow(L *lua.LState) int { func dbQueryRow(L *lua.LState) int {
ud := L.CheckUserData(1) ud := L.CheckUserData(1)
conn, ok := ud.Value.(*DBConnection) conn, ok := ud.Value.(*DBConnection)
if !ok { if !ok {
L.Push(lua.LNil) L.Push(lua.LNil)
L.Push(lua.LString("invalid database connection")) L.Push(lua.LString("invalid database connection"))
return 2 return 2
} }
query := L.CheckString(2) query := L.CheckString(2)
var args []any var args []any
if L.GetTop() >= 3 { if L.GetTop() >= 3 {
params := L.CheckTable(3) params := L.CheckTable(3)
params.ForEach(func(k lua.LValue, v lua.LValue) { params.ForEach(func(k lua.LValue, v lua.LValue) {
args = append(args, ConvertLuaTypesToGolang(v)) args = append(args, ConvertLuaTypesToGolang(v))
}) })
} }
if conn.log { if conn.log {
conn.logger.Info("DB QueryRow", conn.logger.Info("DB QueryRow",
slog.String("query", query), slog.String("query", query),
slog.Any("params", args)) slog.Any("params", args))
} }
mtx := getDBMutex(conn.dbPath) mtx := getDBMutex(conn.dbPath)
mtx.RLock() mtx.RLock()
defer mtx.RUnlock() defer mtx.RUnlock()
db, err := sql.Open("sqlite", conn.dbPath+"?_busy_timeout=5000&_journal_mode=WAL&_sync=NORMAL&_cache_size=-10000") db, err := sql.Open("sqlite", conn.dbPath+"?_busy_timeout=5000&_journal_mode=WAL&_sync=NORMAL&_cache_size=-10000")
if err != nil { if err != nil {
L.Push(lua.LNil) L.Push(lua.LNil)
L.Push(lua.LString(err.Error())) L.Push(lua.LString(err.Error()))
return 2 return 2
} }
defer db.Close() defer db.Close()
row := db.QueryRow(query, args...) row := db.QueryRow(query, args...)
columns := []string{} columns := []string{}
stmt, err := db.Prepare(query) stmt, err := db.Prepare(query)
@@ -278,36 +278,36 @@ func dbQueryRow(L *lua.LState) int {
columns = append(columns, c) columns = append(columns, c)
} }
colCount := len(columns) colCount := len(columns)
values := make([]any, colCount) values := make([]any, colCount)
valuePtrs := make([]any, colCount) valuePtrs := make([]any, colCount)
for i := range columns { for i := range columns {
valuePtrs[i] = &values[i] valuePtrs[i] = &values[i]
} }
err = row.Scan(valuePtrs...) err = row.Scan(valuePtrs...)
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
L.Push(lua.LNil) L.Push(lua.LNil)
return 1 return 1
} }
L.Push(lua.LNil) L.Push(lua.LNil)
L.Push(lua.LString(fmt.Sprintf("scan failed: %v", err))) L.Push(lua.LString(fmt.Sprintf("scan failed: %v", err)))
return 2 return 2
} }
rowTable := L.NewTable() rowTable := L.NewTable()
for i, col := range columns { for i, col := range columns {
val := values[i] val := values[i]
if val == nil { if val == nil {
L.SetField(rowTable, col, lua.LNil) L.SetField(rowTable, col, lua.LNil)
} else { } else {
L.SetField(rowTable, col, ConvertGolangTypesToLua(L, val)) L.SetField(rowTable, col, ConvertGolangTypesToLua(L, val))
} }
} }
L.Push(rowTable) L.Push(rowTable)
return 1 return 1
} }
func dbQuery(L *lua.LState) int { func dbQuery(L *lua.LState) int {

View File

@@ -9,7 +9,7 @@ import (
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app" "github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
) )
var SV1Version = "null" var SV1Version = "v1"
// HandlerV1InitStruct structure is only for initialization // HandlerV1InitStruct structure is only for initialization
type HandlerV1InitStruct struct { type HandlerV1InitStruct struct {

View File

@@ -0,0 +1,12 @@
package sv2
import (
"context"
"net/http"
"github.com/akyaiy/GoSally-mvp/src/internal/server/rpc"
)
func (h *Handler) Handle(_ context.Context, sid string, r *http.Request, req *rpc.RPCRequest) *rpc.RPCResponse {
return nil
}

View File

@@ -0,0 +1,43 @@
// SV2 works with binaries, scripts, and anything else that has access to stdin/stdout.
// Modules run in a separate process and communicate via I/O.
package sv2
import (
"regexp"
"github.com/akyaiy/GoSally-mvp/src/internal/core/corestate"
"github.com/akyaiy/GoSally-mvp/src/internal/engine/app"
)
// HandlerV2InitStruct structure is only for initialization
type HandlerInitStruct struct {
Ver string
CS *corestate.CoreState
X *app.AppX
AllowedCmd *regexp.Regexp
}
type Handler struct {
cs *corestate.CoreState
x *app.AppX
// allowedCmd and listAllowedCmd are regular expressions used to validate command names.
allowedCmd *regexp.Regexp
ver string
}
func InitServer(o *HandlerInitStruct) *Handler {
return &Handler{
cs: o.CS,
x: o.X,
allowedCmd: o.AllowedCmd,
ver: o.Ver,
}
}
// GetVersion returns the API version of the HandlerV1, which is set during initialization.
// This version is used to identify the API version in the request routing.
func (h *Handler) GetVersion() string {
return h.ver
}