@rivascva/dt-idl 1.1.73 → 1.1.75

package/go/log/log.go

@@ -1,10 +1,13 @@
 package log
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"maps"
 	"os"
+
+	"github.com/RivasCVA/dt-idl/go/utils"
 )
 
 type Logger interface {
@@ -18,46 +21,41 @@ type Logger interface {
 	Fatal(m any)
 	// With returns a new log with the given key-value pairs.
 	With(kvs ...any) Logger
+	// WithContext returns a new log with the given context.
+	WithContext(ctx context.Context) Logger
 }
 
 type Log struct {
-	kvs    map[string]any
-	prefix string
-	info   *log.Logger
-	warn   *log.Logger
-	error  *log.Logger
+	kvs   map[string]any
+	info  *log.Logger
+	warn  *log.Logger
+	error *log.Logger
 }
 
 // NewLog creates a new log.
 func NewLog() *Log {
-	return NewLogWithPrefix("")
-}
-
-// NewLogWithPrefix creates a new log with a custom prefix.
-func NewLogWithPrefix(prefix string) *Log {
 	return &Log{
-		kvs:    make(map[string]any, 10),
-		prefix: prefix,
-		info:   log.New(os.Stdout, "[INFO] ", log.LstdFlags),
-		warn:   log.New(os.Stdout, "[WARN] ", log.LstdFlags),
-		error:  log.New(os.Stdout, "[ERROR] ", log.LstdFlags),
+		kvs:   make(map[string]any, 10),
+		info:  log.New(os.Stdout, "", log.LstdFlags),
+		warn:  log.New(os.Stdout, "", log.LstdFlags),
+		error: log.New(os.Stdout, "", log.LstdFlags),
 	}
 }
 
 func (l *Log) Info(m any) {
-	l.info.Println(l.prefix, toJson(m, l.kvs))
+	l.info.Println(toJson(m, l.kvs, "INFO"))
 }
 
 func (l *Log) Warn(m any) {
-	l.warn.Println(l.prefix, toJson(m, l.kvs))
+	l.warn.Println(toJson(m, l.kvs, "WARN"))
 }
 
 func (l *Log) Error(m any) {
-	l.error.Println(l.prefix, toJson(m, l.kvs))
+	l.error.Println(toJson(m, l.kvs, "ERROR"))
 }
 
 func (l *Log) Fatal(m any) {
-	l.error.Fatal(l.prefix, toJson(m, l.kvs))
+	l.error.Fatal(toJson(m, l.kvs, "ERROR"))
 }
 
 func (l *Log) With(kvs ...any) Logger {
@@ -76,11 +74,33 @@ func (l *Log) With(kvs ...any) Logger {
 	}
 
 	return &Log{
-		kvs:    newkvs,
-		prefix: l.prefix,
-		info:   l.info,
-		warn:   l.warn,
-		error:  l.error,
+		kvs:   newkvs,
+		info:  l.info,
+		warn:  l.warn,
+		error: l.error,
+	}
+}
+
+func (l *Log) WithContext(ctx context.Context) Logger {
+	// copy the existing key-value pairs into a new map
+	newkvs := make(map[string]any, len(l.kvs)+10)
+	maps.Copy(newkvs, l.kvs)
+
+	// add the user id to the key-value pairs
+	if userId, err := utils.GetUserIdFromContext(ctx); err == nil {
+		newkvs["userId"] = userId
+	}
+
+	// add the request path to the key-value pairs
+	if path, err := utils.GetPathFromContext(ctx); err == nil {
+		newkvs["path"] = path
+	}
+
+	return &Log{
+		kvs:   newkvs,
+		info:  l.info,
+		warn:  l.warn,
+		error: l.error,
 	}
 }
 

package/go/log/utils.go

@@ -6,12 +6,15 @@ import (
 )
 
 // toJson converts the message and key-value pairs to a JSON string.
-func toJson(m any, kvs map[string]any) string {
+func toJson(m any, kvs map[string]any, level string) string {
 	// copy the key-value pairs into a new map and add the message
 	out := make(map[string]any, len(kvs)+1)
 	maps.Copy(out, kvs)
 	out["msg"] = m
 
+	// add the log level
+	out["level"] = level
+
 	// marshal the map to a JSON byte array
 	data, err := json.Marshal(out)
 	if err != nil {

package/go/middlewares/middlewares.go

@@ -50,6 +50,17 @@ func GetAuthMiddleware(secret string) func(http.Handler) http.Handler {
 	}
 }
 
+// ContextMiddleware attaches helpful information to the request context.
+func ContextMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// set the path in the request context
+		ctx := context.WithValue(r.Context(), models.PathKey, r.URL.Path)
+		r = r.WithContext(ctx)
+
+		next.ServeHTTP(w, r)
+	})
+}
+
 // CommonHeaders adds shared headers to all responses.
 func CommonHeaders(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

package/go/models/constants.go

@@ -6,4 +6,6 @@ type ContextKey string
 const (
 	// TokenKey is the key used to set/get the JWT token in the request context.
 	TokenKey = ContextKey("token")
+	// PathKey is the key used to set/get the request path in the request context.
+	PathKey = ContextKey("path")
 )

package/go/utils/context.go

@@ -37,3 +37,12 @@ func GetUserIdFromContext(ctx context.Context) (string, error) {
 
 	return userId, nil
 }
+
+// GetPathFromContext retrieves the request path from the given context.
+func GetPathFromContext(ctx context.Context) (string, error) {
+	path, ok := ctx.Value(models.PathKey).(string)
+	if !ok {
+		return "", errors.New("path not found in the context")
+	}
+	return path, nil
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivascva/dt-idl",
-  "version": "1.1.73",
+  "version": "1.1.75",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",