From 5333dcbbe95359559415a0f6e5ea7768af19c5e5 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 7 Jun 2024 22:17:25 +0300
Subject: [PATCH] Always log RPC request and response IDs

---
 libgm/event_handler.go   |  6 +++++-
 libgm/session_handler.go | 26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/libgm/event_handler.go b/libgm/event_handler.go
index 7234e29..dd30f58 100644
--- a/libgm/event_handler.go
+++ b/libgm/event_handler.go
@@ -176,7 +176,7 @@ func (c *Client) deduplicateUpdate(id string, msg *IncomingRPCMessage) bool {
 func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) {
 	msg, err := c.decryptInternalMessage(rawMsg)
 	if err != nil {
-		c.Logger.Err(err).Msg("Failed to decode incoming RPC message")
+		c.Logger.Err(err).Str("message_id", rawMsg.ResponseID).Msg("Failed to decode incoming RPC message")
 		c.sessionHandler.queueMessageAck(rawMsg.ResponseID)
 		return
 	}
@@ -185,6 +185,10 @@ func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) {
 	if c.sessionHandler.receiveResponse(msg) {
 		return
 	}
+	c.Logger.Debug().
+		Stringer("message_action", msg.Message.Action).
+		Str("message_id", msg.ResponseID).
+		Msg("Received message")
 	switch msg.BugleRoute {
 	case gmproto.BugleRoute_PairEvent:
 		c.handlePairingEvent(msg)
diff --git a/libgm/session_handler.go b/libgm/session_handler.go
index e38cf8c..bc0ae24 100644
--- a/libgm/session_handler.go
+++ b/libgm/session_handler.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/rs/zerolog"
 	"golang.org/x/exp/slices"
 	"google.golang.org/protobuf/proto"
 
@@ -32,7 +33,7 @@ func (s *SessionHandler) ResetSessionID() {
 }
 
 func (s *SessionHandler) sendMessageNoResponse(params SendMessageParams) error {
-	_, payload, err := s.buildMessage(params)
+	requestID, payload, err := s.buildMessage(params)
 	if err != nil {
 		return err
 	}
@@ -41,6 +42,10 @@ func (s *SessionHandler) sendMessageNoResponse(params SendMessageParams) error {
 	if s.client.AuthData.HasCookies() {
 		url = util.SendMessageURLGoogle
 	}
+	s.client.Logger.Debug().
+		Stringer("message_action", params.Action).
+		Str("message_id", requestID).
+		Msg("Sending request to phone (not expecting response)")
 	_, err = typedHTTPResponse[*gmproto.OutgoingRPCResponse](
 		s.client.makeProtobufHTTPRequest(url, payload, ContentTypePBLite),
 	)
@@ -58,6 +63,10 @@ func (s *SessionHandler) sendAsyncMessage(params SendMessageParams) (<-chan *Inc
 	if s.client.AuthData.HasCookies() {
 		url = util.SendMessageURLGoogle
 	}
+	s.client.Logger.Debug().
+		Stringer("message_action", params.Action).
+		Str("message_id", requestID).
+		Msg("Sending request to phone")
 	_, err = typedHTTPResponse[*gmproto.OutgoingRPCResponse](
 		s.client.makeProtobufHTTPRequest(url, payload, ContentTypePBLite),
 	)
@@ -120,9 +129,11 @@ func (s *SessionHandler) receiveResponse(msg *IncomingRPCMessage) bool {
 	}
 	delete(s.responseWaiters, requestID)
 	s.responseWaitersLock.Unlock()
-	evt := s.client.Logger.Trace().
-		Str("request_id", requestID)
-	if evt.Enabled() {
+	evt := s.client.Logger.Debug().
+		Stringer("message_action", msg.Message.Action).
+		Str("request_message_id", requestID).
+		Str("response_message_id", msg.ResponseID)
+	if s.client.Logger.GetLevel() == zerolog.TraceLevel {
 		if msg.DecryptedData != nil {
 			evt.Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData))
 		}
@@ -131,11 +142,6 @@ func (s *SessionHandler) receiveResponse(msg *IncomingRPCMessage) bool {
 		}
 	}
 	evt.Msg("Received response")
-	if msg.Message.Action == gmproto.ActionType_SEND_MESSAGE {
-		s.client.Logger.Debug().
-			Str("send_response_data", base64.StdEncoding.EncodeToString(msg.DecryptedData)).
-			Msg("Message send response data")
-	}
 	ch <- msg
 	return true
 }
@@ -306,6 +312,6 @@ func (s *SessionHandler) sendAckRequest() {
 		// TODO retry?
 		s.client.Logger.Err(err).Strs("message_ids", dataToAck).Msg("Failed to send acks")
 	} else {
-		s.client.Logger.Debug().Strs("message_ids", dataToAck).Msg("Sent acks")
+		s.client.Logger.Trace().Strs("message_ids", dataToAck).Msg("Sent acks")
 	}
 }