delete unused modules

Auth server

.gitignore

@@ -10,4 +10,8 @@ com/_config.lua
 
 .vscode
 Taskfile.yml
-config.yaml
+config.yaml
+
+# Garbage
+com/_Access/GetMasterAccess.lua
+com/_Zones/GetZoneInfo.lua

com/Access/GetMasterAccess.lua

@@ -1,77 +0,0 @@
-local session = require("internal.session")
-local log = require("internal.log")
-local jwt = require("internal.crypt.jwt")
-local bc = require("internal.crypt.bcrypt")
-local db = require("internal.database.sqlite").connect("db/root.db", {log = true})
-local sha256 = require("internal.crypt.sha256")
-
-log.info("Someone at "..session.request.address.." trying to get master access")
-
-local function close_db()
-  if db then
-    db:close()
-    db = nil
-  end
-end
-
-local params = session.request.params.get()
-
-local function check_missing(arr, p)
-  local is_missing = {}
-  local ok = true
-  for _, key in ipairs(arr) do
-    if p[key] == nil then
-      table.insert(is_missing, key)
-      ok = false
-    end
-  end
-  return ok, is_missing
-end
-
-local ok, mp = check_missing({"master_secret", "master_name", "my_key"}, params)
-if not ok then
-  close_db()
-  session.response.send_error(-32602, "Missing params", mp)
-end
-
-if type(params.master_secret) ~= "string" then
-  close_db()
-  session.response.send_error(-32050, "Access denied")
-end
-
-if type(params.master_name) ~= "string" then
-  close_db()
-  session.response.send_error(-32050, "Access denied")
-end
-
-local master, err = db:query_row("SELECT * FROM master_units WHERE master_name = ?", {params.master_name})
-
-if not master then
-  log.event("DB query failed:", err)
-  close_db()
-  session.response.send_error(-32050, "Access denied")
-end
-
-local ok = bc.compare(master.master_secret, params.master_secret)
-if not ok then
-  log.warn("Login failed: wrong password")
-  close_db()
-  session.response.send_error(-32050, "Access denied")
-end
-
-local token = jwt.encode({
-  secret = require("_config").token(),
-  payload = { 
-    session_uuid = session.id,
-    master_id = master.id,
-    key = sha256.sum(params.my_key)
-  },
-  expires_in = 3600
-})
-
-close_db()
-session.response.send({
-  token = token
-})
-
--- G7HgOgl72o7t7u7r

com/Unit/Create.lua

@@ -0,0 +1,87 @@
+-- File com/Unit/Create.lua
+--
+-- Created at 2025-05-10 18:23
+--
+-- Updated at - 
+-- Description:
+--- Creates a record in the unit.db database without 
+--- requiring additional permissions. Requires username, 
+--- password (hashing occurs at the server level), and email fields.
+
+local log = require("internal.log")
+local db = require("internal.database.sqlite").connect("db/unit.db", {log = true})
+local session = require("internal.session")
+local crypt = require("internal.crypt.bcrypt")
+local sha256 = require("internal.crypt.sha256")
+
+local common = require("com/Unit/_common")
+
+-- Preparing for first db query
+local function close_db()
+  if db then
+    log.debug("Closing DB connection")
+    db:close()
+    db = nil
+  end
+end
+
+local params = session.request.params.get()
+
+local ok, mp = common.CheckMissingElement({"username", "password", "email"}, params)
+if not ok then
+  close_db()
+  session.response.send_error(-32602, "Missing params", mp)
+end
+
+local hashPass = crypt.generate(params.password, crypt.DefaultCost)
+local unitID = string.sub(sha256.hash(session.__seed), 1, 16)
+
+-- First db query: check if username or email already exists among active users
+local existing, err = db:query([[
+  SELECT 1
+  FROM units
+  WHERE (email = ? OR username = ?)
+    AND entry_status != 'deleted'
+    AND deleted_at IS NULL
+  LIMIT 1
+]], {
+  params.email,
+  params.username
+})
+
+if err ~= nil then
+  log.error("Email check failed: "..tostring(err))
+  close_db()
+  session.response.send_error()
+end
+
+if existing and #existing > 0 then
+  close_db()
+  session.response.send_error(-32101, "Unit is already exists")
+end
+
+-- Second db query: insert new unit
+local ctx, err = db:exec(
+  "INSERT INTO units (user_id, username, email, password) VALUES (?, ?, ?, ?)",
+  {
+    unitID,
+    params.username,
+    params.email,
+    hashPass,
+  }
+)
+if err ~= nil then
+  log.error("Insert failed: "..tostring(err))
+  close_db()
+  session.response.send_error("Failed to create unit")
+end
+
+local res, err = ctx:wait()
+if err ~= nil then
+  log.error("Insert confirmation failed: "..tostring(err))
+  close_db()
+  session.response.send_error("Failed to create unit")
+end
+
+close_db()
+session.response.send({message = "Unit created successfully", unit_id = unitID})

com/Unit/Delete.lua

@@ -0,0 +1,76 @@
+-- File com/Unit/Delete.lua
+--
+-- Created at 2025-05-10 19:18
+--
+-- Updated at - 
+
+local log = require("internal.log")
+local db = require("internal.database.sqlite").connect("db/unit.db", {log = true})
+local session = require("internal.session")
+
+local common = require("com/Unit/_common")
+
+-- Preparing for first db query
+local function close_db()
+  if db then
+    log.debug("Closing DB connection")
+    db:close()
+    db = nil
+  end
+end
+
+local params = session.request.params.get()
+
+local ok, mp = common.CheckMissingElement({"user_id"}, params)
+if not ok then
+  close_db()
+  session.response.send_error(-32602, "Missing params", mp)
+end
+
+local existing, err = db:query([[
+  SELECT 1
+  FROM units
+  WHERE user_id = ?
+    AND entry_status != 'deleted'
+    AND deleted_at IS NULL
+  LIMIT 1
+]], {
+  params.user_id
+})
+
+if err ~= nil then
+  log.error("Email check failed: "..tostring(err))
+  close_db()
+  session.response.send_error()
+end
+
+if existing and #existing == 0 then
+  close_db()
+  session.response.send_error(-32102, "Unit is not exists")
+end
+
+local ctx, err = db:exec(
+  [[
+    UPDATE units
+    SET entry_status = 'deleted',
+        deleted_at = CURRENT_TIMESTAMP
+    WHERE user_id = ? AND deleted_at is NULL
+  ]],
+  { params.user_id }
+)
+
+if err ~= nil then
+  log.error("Soft delete failed: " .. tostring(err))
+  close_db()
+  session.response.send_error("Failed to delete unit")
+end
+
+local res, err = ctx:wait()
+if err ~= nil then
+  log.error("Soft delete confirmation failed: " .. tostring(err))
+  close_db()
+  session.response.send_error("Failed to delete unit")
+end
+
+close_db()
+session.response.send({message = "Unit deleted successfully", unit_id = params.user_id})

com/Unit/_common.lua

@@ -0,0 +1,23 @@
+-- File com/Unit/_common.lua
+--
+-- Created at 2025-05-10 18:23
+--
+-- Updated at - 
+-- 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

com/Zones/GetZoneInfo.lua

@@ -1,69 +0,0 @@
-local session = require("internal.session")
-local log = require("internal.log")
-local jwt = require("internal.crypt.jwt")
-local bc = require("internal.crypt.bcrypt")
-local sha256 = require("internal.crypt.sha256")
-local dbdriver = require("internal.database.sqlite")
-
-local db_root = dbdriver.connect("db/root.db", {log = true})
-local db_zone = nil
-
-local function close_db()
-  if db_root then
-    db_root:close()
-    db_root = nil
-  end
-  if db_zone then
-    db_zone:close()
-    db_zone = nil
-  end
-end
-
-local token = session.request.headers.get("authorization")
-
-if not token or type(token) ~= "string" then
-  close_db()
-  session.response.send_error(-32050, "Access denied")
-end
-
-local prefix = "Bearer "
-if token:sub(1, #prefix) ~= prefix then
-  close_db()
-  session.response.send_error(-32052, "Invalid Authorization scheme")
-end
-
-local access_token = token:sub(#prefix + 1)
-
-local err, data = jwt.decode(access_token, { secret = require("_config").token() })
-
-if err or not data then
-  close_db()
-  session.response.send_error(-32053, "Cannod parse JWT", {err})
-end
-
-if data.master_id then
-  
-  
-end
-
-local params = session.request.params.get()
-
-local function check_missing(arr, p)
-  local is_missing = {}
-  local ok = true
-  for _, key in ipairs(arr) do
-    if p[key] == nil then
-      table.insert(is_missing, key)
-      ok = false
-    end
-  end
-  return ok, is_missing
-end
-
-local ok, mp = check_missing({"zone_name"}, params)
-if not ok then
-  close_db()
-  session.response.send_error(-32602, "Missing params", mp)
-end
-
-close_db()

com/test.lua

@@ -0,0 +1,44 @@
+local sha256 = require("internal.crypt.sha256")
+local log = require("internal.log")
+local session = require("internal.session")
+
+-- local secret = require("_config").token()
+
+-- local token = jwt.encode({
+--   secret = secret,
+--   payload = { session_uuid = session.id },
+--   expires_in = 3600
+-- })
+
+-- local err, data = jwt.decode(token, { secret = secret })
+
+-- if not err then
+--   session.response.result = {
+--     token = token
+--   }
+--   return
+-- end
+
+-- session.response.error = {
+--   message = "not sigma"
+-- }
+-- local array = session.request.params.get("array", "oops")
+-- function s()
+--   session.throw_error("dqdqwdqwdqiwhodiwqohdq", 10)
+-- end
+-- s()
+
+-- session.response.__script_data.result = {
+--   data = {
+--     sewf = 1
+--   },
+--   2
+-- }
+session.response.set_error()
+--session.response.send_error({1})
+-- session.response.set()
+-- session.response.__script_data.result = {
+--   status = "ok"
+-- }
+session.response.set(1)
+log.event("popi")

hooks/run.go

@@ -29,6 +29,7 @@ import (
 )
 
 var NodeApp = app.New()
+var AllowedCmdPattern = `^[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*$`
 
 func Run(cmd *cobra.Command, args []string) {
 	NodeApp.InitialHooks(
@@ -60,7 +61,7 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
 	serverv1 := sv1.InitV1Server(&sv1.HandlerV1InitStruct{
 		X:          x,
 		CS:         cs,
-		AllowedCmd: regexp.MustCompile(`^[a-zA-Z0-9]+(>[a-zA-Z0-9]+)*$`),
+		AllowedCmd: regexp.MustCompile(AllowedCmdPattern),
 		Ver:        "v1",
 	})
 

internal/server/sv1/lua_handler.go

@@ -542,7 +542,7 @@ func (h *HandlerV1) handleLUA(sid string, r *http.Request, req *rpc.RPCRequest,
 		llog.Debug("import module crypt.sha256", slog.String("script", path))
 		sha265mod := L.NewTable()
 
-		L.SetField(sha265mod, "sum", L.NewFunction(func(l *lua.LState) int {
+		L.SetField(sha265mod, "hash", L.NewFunction(func(l *lua.LState) int {
 			data := ConvertLuaTypesToGolang(L.Get(1))
 			var dataStr = fmt.Sprint(data)
 

internal/server/sv1/path.go

@@ -9,12 +9,14 @@ import (
 	"github.com/akyaiy/GoSally-mvp/internal/server/rpc"
 )
 
+var RPCMethodSeparator = "."
+
 func (h *HandlerV1) resolveMethodPath(method string) (string, error) {
 	if !h.allowedCmd.MatchString(method) {
 		return "", errors.New(rpc.ErrInvalidMethodFormatS)
 	}
 
-	parts := strings.Split(method, ">")
+	parts := strings.Split(method, RPCMethodSeparator)
 	relPath := filepath.Join(parts...) + ".lua"
 	fullPath := filepath.Join(*h.x.Config.Conf.Node.ComDir, relPath)