@rivascva/dt-idl 1.1.74 → 1.1.76

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,6 +21,8 @@ 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 {
@@ -31,26 +36,26 @@ type Log struct {
 func NewLog() *Log {
 	return &Log{
 		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),
+		info:  log.New(os.Stdout, "", 0),
+		warn:  log.New(os.Stdout, "", 0),
+		error: log.New(os.Stdout, "", 0),
 	}
 }
 
 func (l *Log) Info(m any) {
-	l.info.Println(toJson(m, l.kvs, "INFO"))
+	l.info.Println(toJson(m, l.kvs, "Info"))
 }
 
 func (l *Log) Warn(m any) {
-	l.warn.Println(toJson(m, l.kvs, "WARN"))
+	l.warn.Println(toJson(m, l.kvs, "Warn"))
 }
 
 func (l *Log) Error(m any) {
-	l.error.Println(toJson(m, l.kvs, "ERROR"))
+	l.error.Println(toJson(m, l.kvs, "Error"))
 }
 
 func (l *Log) Fatal(m any) {
-	l.error.Fatal(toJson(m, l.kvs, "ERROR"))
+	l.error.Fatal(toJson(m, l.kvs, "Error"))
 }
 
 func (l *Log) With(kvs ...any) Logger {
@@ -76,5 +81,28 @@ func (l *Log) With(kvs ...any) Logger {
 	}
 }
 
+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,
+	}
+}
+
 //exhaustruct:ignore - check for interface implementation
 var _ Logger = &Log{}

package/go/log/utils.go

@@ -3,6 +3,7 @@ package log
 import (
 	"encoding/json"
 	"maps"
+	"time"
 )
 
 // toJson converts the message and key-value pairs to a JSON string.
@@ -15,6 +16,9 @@ func toJson(m any, kvs map[string]any, level string) string {
 	// add the log level
 	out["level"] = level
 
+	// add the timestamp
+	out["timestamp"] = time.Now().UTC().Format(time.RFC3339)
+
 	// 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.74",
+  "version": "1.1.76",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",