From 62c4724ada4733e1b912e10f472b0970cd4c3200 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 27 Sep 2021 15:11:09 -0700 Subject: [PATCH] Upgrade Tapir --- go.mod | 4 ++-- protocol/connections/engine.go | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 764d07c..7d0f232 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module cwtch.im/cwtch go 1.14 require ( - git.openprivacy.ca/cwtch.im/tapir v0.4.7 + git.openprivacy.ca/cwtch.im/tapir v0.4.8 git.openprivacy.ca/openprivacy/connectivity v1.4.5 git.openprivacy.ca/openprivacy/log v1.0.3 github.com/gtank/ristretto255 v0.1.2 @@ -14,4 +14,4 @@ require ( golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 golang.org/x/tools v0.1.2 // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect -) +) \ No newline at end of file diff --git a/protocol/connections/engine.go b/protocol/connections/engine.go index 9c55b48..cab8500 100644 --- a/protocol/connections/engine.go +++ b/protocol/connections/engine.go @@ -12,7 +12,7 @@ import ( "cwtch.im/cwtch/model" "cwtch.im/cwtch/protocol/files" "cwtch.im/cwtch/protocol/groups" - model3 "cwtch.im/cwtch/protocol/model" + pmodel "cwtch.im/cwtch/protocol/model" "git.openprivacy.ca/cwtch.im/tapir" "git.openprivacy.ca/cwtch.im/tapir/applications" "git.openprivacy.ca/cwtch.im/tapir/networks/tor" @@ -138,7 +138,7 @@ func (e *engine) eventHandler() { go e.peerWithOnion(ev.Data[event.RemotePeer]) } case event.InvitePeerToGroup: - err := e.sendPeerMessage(ev.Data[event.RemotePeer], model3.PeerMessage{ID: ev.EventID, Context: event.ContextInvite, Data: []byte(ev.Data[event.GroupInvite])}) + err := e.sendPeerMessage(ev.Data[event.RemotePeer], pmodel.PeerMessage{ID: ev.EventID, Context: event.ContextInvite, Data: []byte(ev.Data[event.GroupInvite])}) if err != nil { } @@ -168,7 +168,7 @@ func (e *engine) eventHandler() { if !ok { context = event.ContextRaw } - if err := e.sendPeerMessage(ev.Data[event.RemotePeer], model3.PeerMessage{ID: ev.EventID, Context: context, Data: []byte(ev.Data[event.Data])}); err != nil { + if err := e.sendPeerMessage(ev.Data[event.RemotePeer], pmodel.PeerMessage{ID: ev.EventID, Context: context, Data: []byte(ev.Data[event.Data])}); err != nil { e.eventManager.Publish(event.NewEvent(event.SendMessageToPeerError, map[event.Field]string{event.RemotePeer: ev.Data[event.RemotePeer], event.EventID: ev.EventID, event.Error: "peer is offline or the connection has yet to finalize"})) } case event.SendGetValMessageToPeer: @@ -453,7 +453,7 @@ func (e *engine) sendGetValToPeer(eventID, onion, scope, path string) error { } e.getValRequests.Store(onion+eventID, message) - return e.sendPeerMessage(onion, model3.PeerMessage{ID: eventID, Context: event.ContextGetVal, Data: message}) + return e.sendPeerMessage(onion, pmodel.PeerMessage{ID: eventID, Context: event.ContextGetVal, Data: message}) } func (e *engine) sendRetValToPeer(eventID, onion, val, existsStr string) error { @@ -464,7 +464,7 @@ func (e *engine) sendRetValToPeer(eventID, onion, val, existsStr string) error { if err != nil { return err } - return e.sendPeerMessage(onion, model3.PeerMessage{ID: eventID, Context: event.ContextRetVal, Data: message}) + return e.sendPeerMessage(onion, pmodel.PeerMessage{ID: eventID, Context: event.ContextRetVal, Data: message}) } func (e *engine) deleteConnection(id string) { @@ -510,7 +510,7 @@ func (e *engine) sendMessageToGroup(groupID string, server string, ct []byte, si // we failed to post, probably because we ran out of tokens... so make a payment go tokenApp.MakePayment() // backoff - time.Sleep(time.Second) + time.Sleep(time.Second * 5) // try again e.sendMessageToGroup(groupID, server, ct, sig, attempts+1) } else { @@ -585,7 +585,7 @@ func (e *engine) handlePeerMessage(hostname string, eventID string, context stri // Send an explicit acknowledgement // Every other protocol should have a explicit acknowledgement message e.g. value lookups have responses, and file handling has an explicit flow - if err := e.sendPeerMessage(hostname, model3.PeerMessage{ID: eventID, Context: event.ContextAck, Data: []byte{}}); err != nil { + if err := e.sendPeerMessage(hostname, pmodel.PeerMessage{ID: eventID, Context: event.ContextAck, Data: []byte{}}); err != nil { e.eventManager.Publish(event.NewEvent(event.SendMessageToPeerError, map[event.Field]string{event.RemotePeer: hostname, event.EventID: eventID, event.Error: err.Error()})) } } @@ -618,16 +618,16 @@ func (e *engine) leaveServer(server string) { } } -func (e *engine) sendPeerMessage(handle string, message model3.PeerMessage) error { +func (e *engine) sendPeerMessage(handle string, message pmodel.PeerMessage) error { conn, err := e.service.WaitForCapabilityOrClose(handle, cwtchCapability) if err == nil { peerApp, ok := (conn.App()).(*PeerApp) if ok { return peerApp.SendMessage(message) } - log.Errorf("could not derive peer app: %v", err) + log.Debugf("could not derive peer app: %v", err) return fmt.Errorf("could not find peer app to send message to: %v", handle) } - log.Errorf("could not send peer message: %v", err) + log.Debugf("could not send peer message: %v", err) return err }