seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always log RPC request and response IDs

Browse source
This commit is contained in:
Tulir Asokan 2024-06-07 22:17:25 +03:00
parent 18f012d2d0
commit 5333dcbbe9
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libgm/event_handler.go
View file

@ -176,7 +176,7 @@ func (c *Client) deduplicateUpdate(id string, msg *IncomingRPCMessage) bool {
func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) { func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) {
msg, err := c.decryptInternalMessage(rawMsg) msg, err := c.decryptInternalMessage(rawMsg)
if err != nil { 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) c.sessionHandler.queueMessageAck(rawMsg.ResponseID)
return return
} }
@ -185,6 +185,10 @@ func (c *Client) HandleRPCMsg(rawMsg *gmproto.IncomingRPCMessage) {
if c.sessionHandler.receiveResponse(msg) { if c.sessionHandler.receiveResponse(msg) {
return return
} }
c.Logger.Debug().
Stringer("message_action", msg.Message.Action).
Str("message_id", msg.ResponseID).
Msg("Received message")
switch msg.BugleRoute { switch msg.BugleRoute {
case gmproto.BugleRoute_PairEvent: case gmproto.BugleRoute_PairEvent:
c.handlePairingEvent(msg) c.handlePairingEvent(msg)

26
libgm/session_handler.go
View file

@ -7,6 +7,7 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
@ -32,7 +33,7 @@ func (s *SessionHandler) ResetSessionID() {
} }
func (s *SessionHandler) sendMessageNoResponse(params SendMessageParams) error { func (s *SessionHandler) sendMessageNoResponse(params SendMessageParams) error {
_, payload, err := s.buildMessage(params) requestID, payload, err := s.buildMessage(params)
if err != nil { if err != nil {
return err return err
} }
@ -41,6 +42,10 @@ func (s *SessionHandler) sendMessageNoResponse(params SendMessageParams) error {
if s.client.AuthData.HasCookies() { if s.client.AuthData.HasCookies() {
url = util.SendMessageURLGoogle 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]( _, err = typedHTTPResponse[*gmproto.OutgoingRPCResponse](
s.client.makeProtobufHTTPRequest(url, payload, ContentTypePBLite), s.client.makeProtobufHTTPRequest(url, payload, ContentTypePBLite),
) )
@ -58,6 +63,10 @@ func (s *SessionHandler) sendAsyncMessage(params SendMessageParams) (<-chan *Inc
if s.client.AuthData.HasCookies() { if s.client.AuthData.HasCookies() {
url = util.SendMessageURLGoogle 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]( _, err = typedHTTPResponse[*gmproto.OutgoingRPCResponse](
s.client.makeProtobufHTTPRequest(url, payload, ContentTypePBLite), s.client.makeProtobufHTTPRequest(url, payload, ContentTypePBLite),
) )
@ -120,9 +129,11 @@ func (s *SessionHandler) receiveResponse(msg *IncomingRPCMessage) bool {
} }
delete(s.responseWaiters, requestID) delete(s.responseWaiters, requestID)
s.responseWaitersLock.Unlock() s.responseWaitersLock.Unlock()
evt := s.client.Logger.Trace(). evt := s.client.Logger.Debug().
Str("request_id", requestID) Stringer("message_action", msg.Message.Action).
if evt.Enabled() { Str("request_message_id", requestID).
Str("response_message_id", msg.ResponseID)
if s.client.Logger.GetLevel() == zerolog.TraceLevel {
if msg.DecryptedData != nil { if msg.DecryptedData != nil {
evt.Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData)) evt.Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData))
} }
@ -131,11 +142,6 @@ func (s *SessionHandler) receiveResponse(msg *IncomingRPCMessage) bool {
} }
} }
evt.Msg("Received response") 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 ch <- msg
return true return true
} }
@ -306,6 +312,6 @@ func (s *SessionHandler) sendAckRequest() {
// TODO retry? // TODO retry?
s.client.Logger.Err(err).Strs("message_ids", dataToAck).Msg("Failed to send acks") s.client.Logger.Err(err).Strs("message_ids", dataToAck).Msg("Failed to send acks")
} else { } else {
s.client.Logger.Debug().Strs("message_ids", dataToAck).Msg("Sent acks") s.client.Logger.Trace().Strs("message_ids", dataToAck).Msg("Sent acks")
} }
} }