addicionado: banco de dados sqlitq

Author: jrCleber

.air.toml

@@ -0,0 +1,51 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = ["clear"]
+  bin = "./tmp/main"
+  cmd = "go build -o ./tmp/main ./cmd/server/main.go"
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_file = []
+  exclude_regex = ["_test.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  post_cmd = []
+  pre_cmd = []
+  rerun = false
+  rerun_delay = 500
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[proxy]
+  app_port = 0
+  enabled = false
+  proxy_port = 0
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true

.gitignore

@@ -1,4 +1,6 @@
 .env
 go.sum
 instances
-main
+main
+testdata
+tmp

Dockerfile

@@ -1,10 +1,16 @@
 FROM golang:1.22.3-bullseye
 
-LABEL version="0.0.1" description="Worker HTTP para Gerenciamento de Sessões na API de WhatsApp" 
-LABEL maintainer="jrCleber" git="https://github.com/jrCleber"
-LABEL contact="suporte@codechat.dev"
+LABEL codechat.worker.version="0.0.2" 
+LABEL codechat.worker.description="Worker HTTP para Gerenciamento de Sessões na API de WhatsApp" 
+LABEL codechat.worker.maintainer="jrCleber" 
+LABEL codechat.worker.git="https://github.com/jrCleber"
+LABEL codechat.worker.contact="suporte@codechat.dev"
 
 ENV DOCKER_ENV=true
+ENV CGO_ENABLED=1
+
+RUN apt-get install gcc
+RUN apt-get install build-essential
 
 WORKDIR /worker
 

README.md

@@ -49,9 +49,18 @@ Além disso, um token global deve ser definido nas variáveis de ambiente. O cli
 │   └── app.go
 │
 ├── /pkg
-│   └── /config
-│       └── config.go
+│   ├── /config
+│   │   └── config.go
+│   └── /db
+│       ├── /models
+│       │   └── creds_model.go
+│       └── conn.go
 │
+├── /tmp
+│   ├── build-errors.log
+│   └── main
+│
+├── .air.toml
 ├── .env
 ├── .gitignore
 ├── build.sh
@@ -63,6 +72,20 @@ Além disso, um token global deve ser definido nas variáveis de ambiente. O cli
 └── README.md
 ```
 
+---
+## Ajuste de compatibilidade com SQLite se necessário
+
+- `build-essential`
+  ```sh
+  sudo apt-get install build-essential
+  ```
+
+- `gcc`
+  ```sh
+  sudo apt-get install gcc
+  ```
+---
+
 ## Instalação
 
 ### Instalando o GO

api/handlers/handler.go

@@ -6,8 +6,8 @@ import (
 )
 
 type Response struct {
-	Code int      `json:"statusCode"`
-	Data any      `json:"message,omitempty"`
+	Code int    `json:"statusCode"`
+	Data any    `json:"message,omitempty"`
 	Err  string `json:"error"`
 }
 
@@ -58,14 +58,14 @@ func UnmarshalDescriptionError(e error) *Response {
 			return &Response{
 				Code: http.StatusBadRequest,
 				Data: []string{"body is empty"},
-				Err: "Bad Request",
+				Err:  "Bad Request",
 			}
 		}
 		fieldName, dataType := extractErrorDetails(e.Error())
 		return &Response{
 			Code: http.StatusBadRequest,
 			Data: []string{fieldName + " must be of type " + dataType + "."},
-			Err: "Bad Request",
+			Err:  "Bad Request",
 		}
 	}
 

api/handlers/session_handler.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"worker-session/internal/session"
 
@@ -25,14 +26,14 @@ func getParams(r *http.Request) (string, string, string) {
 	return group, instance, key
 }
 
-func (h *Session) POST_GroupFolder(r *http.Request) *Response {
+func (h *Session) POST_Group(r *http.Request) *Response {
 	var body map[string]string
 	e := render.DecodeJSON(r.Body, &body)
 	if err := UnmarshalDescriptionError(e); err != nil {
 		return err
 	}
 
-	status, err := h.service.CreateFolder(body["group"], "")
+	status, err := h.service.CreateGroup(body["group"])
 
 	response := NewResponse(status)
 
@@ -44,7 +45,24 @@ func (h *Session) POST_GroupFolder(r *http.Request) *Response {
 	return response
 }
 
-func (h *Session) POST_InstanceFolder(r *http.Request) *Response {
+func (h *Session) DELETE_Group(r *http.Request) *Response {
+	params_group, _, _ := getParams(r)
+
+	status, err := h.service.RemoveGroup(params_group)
+
+	response := NewResponse(status)
+
+	if err != nil {
+		response.SetError(err)
+		return response
+	}
+
+	response.SetCode(status)
+
+	return response
+}
+
+func (h *Session) POST_InstanceDB(r *http.Request) *Response {
 	var body map[string]string
 	e := render.DecodeJSON(r.Body, &body)
 	if err := UnmarshalDescriptionError(e); err != nil {
@@ -53,7 +71,7 @@ func (h *Session) POST_InstanceFolder(r *http.Request) *Response {
 
 	params_group, _, _ := getParams(r)
 
-	status, err := h.service.CreateFolder(params_group, body["instance"])
+	status, err := h.service.CreateInstanceDb(params_group, body["instance"])
 
 	response := NewResponse(status)
 
@@ -65,10 +83,10 @@ func (h *Session) POST_InstanceFolder(r *http.Request) *Response {
 	return response
 }
 
-func (h *Session) DELETE_InstanceFolder(r *http.Request) *Response {
+func (h *Session) DELETE_InstanceDB(r *http.Request) *Response {
 	params_group, params_instance, _ := getParams(r)
 
-	status, err := h.service.RemoveFolder(params_group, params_instance)
+	status, err := h.service.RemoveInstanceDb(params_group, params_instance)
 
 	response := NewResponse(status)
 
@@ -83,7 +101,7 @@ func (h *Session) DELETE_InstanceFolder(r *http.Request) *Response {
 }
 
 func (h *Session) POST_Credentials(r *http.Request) *Response {
-	var body map[string]string
+	var body map[string]any
 	e := render.DecodeJSON(r.Body, &body)
 	if err := UnmarshalDescriptionError(e); err != nil {
 		return err
@@ -119,9 +137,15 @@ func (h *Session) GET_Credentials(r *http.Request) *Response {
 		return response
 	}
 
+	json_str := string(binary)
+	var unescaped string
+	json.Unmarshal([]byte(json_str), &unescaped)
+
 	var data map[string]any
-	err = json.Unmarshal(binary, &data)
+	err = json.Unmarshal([]byte(unescaped), &data)
+	fmt.Println("2")
 	if err != nil {
+		response.SetCode(http.StatusBadRequest)
 		response.SetError(err)
 		return response
 	}

api/routers/session_routes.go

@@ -26,17 +26,17 @@ func (x *Session) Routes() *chi.Mux {
 		r.Use(middlewares.AuthGuard(x.env.GlobalToken))
 
 		// Criando a pasta que conterá o grupo de instâncias
-		r.Post("/", ResponseRequest(x.handler.POST_GroupFolder))
+		r.Post("/", ResponseRequest(x.handler.POST_Group))
 		// Removendo o grupo com todas as instâncias
-		r.Delete("/", ResponseRequest(x.handler.DELETE_InstanceFolder))
+		r.Delete("/", ResponseRequest(x.handler.DELETE_Group))
 	})
 
 	instance_router := chi.NewRouter()
 	instance_router.Route("/", func(r chi.Router) {
 		r.Use(middlewares.LimitBodySize(x.env.LimitBody))
 
-		r.Post("/", ResponseRequest(x.handler.POST_InstanceFolder))
-		r.Delete("/{instance}", ResponseRequest(x.handler.DELETE_InstanceFolder))
+		r.Post("/", ResponseRequest(x.handler.POST_InstanceDB))
+		r.Delete("/{instance}", ResponseRequest(x.handler.DELETE_InstanceDB))
 
 		r.Post("/{instance}/{key}", ResponseRequest(x.handler.POST_Credentials))
 		r.Get("/{instance}/{key}", ResponseRequest(x.handler.GET_Credentials))

go.mod

@@ -4,6 +4,14 @@ go 1.22.3
 
 require github.com/go-chi/render v1.0.3
 
+require (
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/mattn/go-sqlite3 v1.14.17 // indirect
+	gorm.io/driver/sqlite v1.5.5 // indirect
+	gorm.io/gorm v1.25.10 // indirect
+)
+
 require (
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/go-chi/chi/v5 v5.0.12 // indirect