From 45074774863e3eb789d89be9d779b85609bef7a0 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Tue, 11 Apr 2023 07:10:05 -0300
Subject: [PATCH] slight improvements to debug logging.

---
 relay.go             | 10 +++++++---
 subscription.go      |  2 +-
 subscription_test.go |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/relay.go b/relay.go
index cbccad5..75902ee 100644
--- a/relay.go
+++ b/relay.go
@@ -160,6 +160,7 @@ func (r *Relay) Connect(ctx context.Context) error {
 
 			switch command {
 			case "NOTICE":
+				DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
 				var content string
 				json.Unmarshal(jsonMessage[1], &content)
 				go func() {
@@ -170,6 +171,7 @@ func (r *Relay) Connect(ctx context.Context) error {
 					r.mutex.RUnlock()
 				}()
 			case "AUTH":
+				DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
 				var challenge string
 				json.Unmarshal(jsonMessage[1], &challenge)
 				go func() {
@@ -226,6 +228,7 @@ func (r *Relay) Connect(ctx context.Context) error {
 				if len(jsonMessage) < 2 {
 					continue
 				}
+				DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
 				var subId string
 				json.Unmarshal(jsonMessage[1], &subId)
 				if subscription, ok := r.subscriptions.Load(subId); ok {
@@ -237,6 +240,7 @@ func (r *Relay) Connect(ctx context.Context) error {
 				if len(jsonMessage) < 3 {
 					continue
 				}
+				DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
 				var (
 					eventId string
 					ok      bool
@@ -249,8 +253,6 @@ func (r *Relay) Connect(ctx context.Context) error {
 					json.Unmarshal(jsonMessage[3], &msg)
 				}
 
-				DebugLogger.Printf("{%s} OK: %s %v %s\n", r.URL, eventId, ok, msg)
-
 				if okCallback, exist := r.okCallbacks.Load(eventId); exist {
 					okCallback(ok, msg)
 				}
@@ -373,7 +375,9 @@ func (r *Relay) Auth(ctx context.Context, event Event) (Status, error) {
 	defer r.okCallbacks.Delete(event.ID)
 
 	// send AUTH
-	if err := r.Connection.WriteJSON([]interface{}{"AUTH", event}); err != nil {
+	authResponse := []interface{}{"AUTH", event}
+	DebugLogger.Printf("{%s} sending %v\n", r.URL, authResponse)
+	if err := r.Connection.WriteJSON(authResponse); err != nil {
 		// status will be "failed"
 		return status, err
 	}
diff --git a/subscription.go b/subscription.go
index 98f5758..c9f4c79 100644
--- a/subscription.go
+++ b/subscription.go
@@ -68,7 +68,7 @@ func (sub *Subscription) Fire() error {
 		message = append(message, filter)
 	}
 
-	DebugLogger.Printf("{%s} REQ: %v", sub.Relay.URL, message)
+	DebugLogger.Printf("{%s} sending %v", sub.Relay.URL, message)
 
 	err := sub.conn.WriteJSON(message)
 	if err != nil {
diff --git a/subscription_test.go b/subscription_test.go
index 082d73a..f004c67 100644
--- a/subscription_test.go
+++ b/subscription_test.go
@@ -9,7 +9,7 @@ import (
 // test if we can connect to wss://relay.damus.io and fetch a couple of random events
 func TestSubscribe(t *testing.T) {
 	rl := mustRelayConnect("wss://relay.damus.io")
-	defer rl.Close("")
+	defer rl.Close()
 
 	sub, err := rl.Subscribe(context.Background(), Filters{{Kinds: []int{1}, Limit: 2}})
 	if err != nil {