File Sharing MVP #384

Merged
sarah merged 52 commits from filesharing into master 2021-09-30 00:57:14 +00:00
2 changed files with 8 additions and 5 deletions
Showing only changes of commit 85a45a27f6 - Show all commits

View File

@ -591,8 +591,7 @@ func (e *engine) sendPeerMessage(handle string, message model3.PeerMessage) erro
if err == nil {
peerApp, ok := (conn.App()).(*PeerApp)
if ok {
peerApp.SendMessage(message)
return nil
return peerApp.SendMessage(message)
}
}
log.Errorf("could not send peer message: %v", err)

View File

@ -108,10 +108,14 @@ func (pa *PeerApp) listen() {
// SendMessage sends the peer a preformatted message
// NOTE: This is a stub, we will likely want to extend this to better reflect the desired protocol
func (pa *PeerApp) SendMessage(message model2.PeerMessage) {
func (pa *PeerApp) SendMessage(message model2.PeerMessage) error {
if message.Context == event.ContextGetVal {
pa.getValRequests.Store(message.ID, string(message.Data))
}
serialized, _ := json.Marshal(message)
pa.connection.Send(serialized)
serialized, err := json.Marshal(message)
if err == nil {
pa.connection.Send(serialized)
return nil
}
return err
}