diff options
author | Wim <wim@42.be> | 2022-05-09 23:00:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 23:00:23 +0200 |
commit | 1e55dd47f251ae588fb418ac29cbc6a0ae741e69 (patch) | |
tree | b3b930c3f864d82ebeb079fcfbbf570b1620ca3f /vendor/go.mau.fi/whatsmeow/request.go | |
parent | 700b95546b4fbc4bbd094ab1804406c13634d7e2 (diff) | |
download | matterbridge-msglm-1e55dd47f251ae588fb418ac29cbc6a0ae741e69.tar.gz matterbridge-msglm-1e55dd47f251ae588fb418ac29cbc6a0ae741e69.tar.bz2 matterbridge-msglm-1e55dd47f251ae588fb418ac29cbc6a0ae741e69.zip |
Update dependencies (#1831)
Diffstat (limited to 'vendor/go.mau.fi/whatsmeow/request.go')
-rw-r--r-- | vendor/go.mau.fi/whatsmeow/request.go | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/vendor/go.mau.fi/whatsmeow/request.go b/vendor/go.mau.fi/whatsmeow/request.go index dc693983..444ae1ad 100644 --- a/vendor/go.mau.fi/whatsmeow/request.go +++ b/vendor/go.mau.fi/whatsmeow/request.go @@ -8,6 +8,7 @@ package whatsmeow import ( "context" + "encoding/base64" "strconv" "sync/atomic" "time" @@ -20,13 +21,17 @@ func (cli *Client) generateRequestID() string { return cli.uniqueID + strconv.FormatUint(uint64(atomic.AddUint32(&cli.idCounter, 1)), 10) } -var closedNode = &waBinary.Node{Tag: "xmlstreamend"} +var xmlStreamEndNode = &waBinary.Node{Tag: "xmlstreamend"} -func (cli *Client) clearResponseWaiters() { +func isDisconnectNode(node *waBinary.Node) bool { + return node == xmlStreamEndNode || node.Tag == "stream:error" +} + +func (cli *Client) clearResponseWaiters(node *waBinary.Node) { cli.responseWaitersLock.Lock() for _, waiter := range cli.responseWaiters { select { - case waiter <- closedNode: + case waiter <- node: default: close(waiter) } @@ -86,7 +91,7 @@ type infoQuery struct { Context context.Context } -func (cli *Client) sendIQAsync(query infoQuery) (<-chan *waBinary.Node, error) { +func (cli *Client) sendIQAsyncDebug(query infoQuery) (<-chan *waBinary.Node, []byte, error) { if len(query.ID) == 0 { query.ID = cli.generateRequestID() } @@ -102,20 +107,25 @@ func (cli *Client) sendIQAsync(query infoQuery) (<-chan *waBinary.Node, error) { if !query.Target.IsEmpty() { attrs["target"] = query.Target } - err := cli.sendNode(waBinary.Node{ + data, err := cli.sendNodeDebug(waBinary.Node{ Tag: "iq", Attrs: attrs, Content: query.Content, }) if err != nil { cli.cancelResponse(query.ID, waiter) - return nil, err + return nil, data, err } - return waiter, nil + return waiter, data, nil +} + +func (cli *Client) sendIQAsync(query infoQuery) (<-chan *waBinary.Node, error) { + ch, _, err := cli.sendIQAsyncDebug(query) + return ch, err } func (cli *Client) sendIQ(query infoQuery) (*waBinary.Node, error) { - resChan, err := cli.sendIQAsync(query) + resChan, data, err := cli.sendIQAsyncDebug(query) if err != nil { return nil, err } @@ -127,8 +137,11 @@ func (cli *Client) sendIQ(query infoQuery) (*waBinary.Node, error) { } select { case res := <-resChan: - if res == closedNode { - return nil, ErrIQDisconnected + if isDisconnectNode(res) { + if cli.DebugDecodeBeforeSend && res.Tag == "stream:error" && res.GetChildByTag("xml-not-well-formed").Tag != "" { + cli.Log.Debugf("Info query that was interrupted by xml-not-well-formed: %s", base64.URLEncoding.EncodeToString(data)) + } + return nil, &DisconnectedError{Action: "info query", Node: res} } resType, _ := res.Attrs["type"].(string) if res.Tag != "iq" || (resType != "result" && resType != "error") { |