cwtch.im
/
cwtch
16
20
Fork 15
Code Issues 10 Pull Requests 1 Releases 163 Wiki Activity

Upgrade Tapir
continuous-integration/drone/push Build is pending Details
continuous-integration/drone/pr Build is pending Details

This commit is contained in:
Sarah Jamie Lewis 2021-09-27 15:11:09 -07:00
parent 98239ae7ea
commit 62c4724ada
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -3,7 +3,7 @@ module cwtch.im/cwtch
go 1.14 go 1.14
require ( 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/connectivity v1.4.5
git.openprivacy.ca/openprivacy/log v1.0.3 git.openprivacy.ca/openprivacy/log v1.0.3
github.com/gtank/ristretto255 v0.1.2 github.com/gtank/ristretto255 v0.1.2
@ -14,4 +14,4 @@ require (
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
golang.org/x/tools v0.1.2 // indirect golang.org/x/tools v0.1.2 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
) )

20
protocol/connections/engine.go
View File

@ -12,7 +12,7 @@ import (
"cwtch.im/cwtch/model" "cwtch.im/cwtch/model"
"cwtch.im/cwtch/protocol/files" "cwtch.im/cwtch/protocol/files"
"cwtch.im/cwtch/protocol/groups" "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"
"git.openprivacy.ca/cwtch.im/tapir/applications" "git.openprivacy.ca/cwtch.im/tapir/applications"
"git.openprivacy.ca/cwtch.im/tapir/networks/tor" "git.openprivacy.ca/cwtch.im/tapir/networks/tor"
@ -138,7 +138,7 @@ func (e *engine) eventHandler() {
go e.peerWithOnion(ev.Data[event.RemotePeer]) go e.peerWithOnion(ev.Data[event.RemotePeer])
} }
case event.InvitePeerToGroup: 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 { if err != nil {
} }
@ -168,7 +168,7 @@ func (e *engine) eventHandler() {
if !ok { if !ok {
context = event.ContextRaw 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"})) 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: case event.SendGetValMessageToPeer:
@ -453,7 +453,7 @@ func (e *engine) sendGetValToPeer(eventID, onion, scope, path string) error {
} }
e.getValRequests.Store(onion+eventID, message) 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 { 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 { if err != nil {
return err 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) { 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 // we failed to post, probably because we ran out of tokens... so make a payment
go tokenApp.MakePayment() go tokenApp.MakePayment()
// backoff // backoff
time.Sleep(time.Second) time.Sleep(time.Second * 5)
// try again // try again
e.sendMessageToGroup(groupID, server, ct, sig, attempts+1) e.sendMessageToGroup(groupID, server, ct, sig, attempts+1)
} else { } else {
@ -585,7 +585,7 @@ func (e *engine) handlePeerMessage(hostname string, eventID string, context stri
// Send an explicit acknowledgement // 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 // 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()})) 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) conn, err := e.service.WaitForCapabilityOrClose(handle, cwtchCapability)
if err == nil { if err == nil {
peerApp, ok := (conn.App()).(*PeerApp) peerApp, ok := (conn.App()).(*PeerApp)
if ok { if ok {
return peerApp.SendMessage(message) 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) 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 return err
} }