089740758c
Unfortunately, the IMAP protocol hasn't been designed to be used from multiple goroutines at the same time. For instance, if you fetch twice the same message from two different goroutines, it's not possible to tell whether the response is for one receiver or the other. For this reason, go-imap clients aren't safe to use from multiple goroutines. This commit changes the IMAP workers to be synchronous again (a command is executed only after the previous one has completed). To use IMAP from different threads, popular clients (e.g. Thunderbird) typically open multiple connections.
91 lines
2.4 KiB
Go
91 lines
2.4 KiB
Go
package imap
|
|
|
|
import (
|
|
"github.com/emersion/go-imap"
|
|
|
|
"git.sr.ht/~sircmpwn/aerc2/worker/types"
|
|
)
|
|
|
|
func (imapw *IMAPWorker) handleFetchMessageHeaders(
|
|
msg *types.FetchMessageHeaders) {
|
|
|
|
imapw.worker.Logger.Printf("Fetching message headers")
|
|
items := []imap.FetchItem{
|
|
imap.FetchBodyStructure,
|
|
imap.FetchEnvelope,
|
|
imap.FetchInternalDate,
|
|
imap.FetchFlags,
|
|
imap.FetchUid,
|
|
}
|
|
|
|
imapw.handleFetchMessages(msg, &msg.Uids, items, nil)
|
|
}
|
|
|
|
func (imapw *IMAPWorker) handleFetchMessageBodyPart(
|
|
msg *types.FetchMessageBodyPart) {
|
|
|
|
imapw.worker.Logger.Printf("Fetching message part")
|
|
section := &imap.BodySectionName{}
|
|
section.Path = []int{msg.Part + 1}
|
|
items := []imap.FetchItem{section.FetchItem()}
|
|
uids := imap.SeqSet{}
|
|
uids.AddNum(msg.Uid)
|
|
imapw.handleFetchMessages(msg, &uids, items, section)
|
|
}
|
|
|
|
func (imapw *IMAPWorker) handleFetchFullMessages(
|
|
msg *types.FetchFullMessages) {
|
|
|
|
imapw.worker.Logger.Printf("Fetching full messages")
|
|
section := &imap.BodySectionName{}
|
|
items := []imap.FetchItem{section.FetchItem()}
|
|
imapw.handleFetchMessages(msg, &msg.Uids, items, section)
|
|
}
|
|
|
|
func (imapw *IMAPWorker) handleFetchMessages(
|
|
msg types.WorkerMessage, uids *imap.SeqSet, items []imap.FetchItem,
|
|
section *imap.BodySectionName) {
|
|
|
|
messages := make(chan *imap.Message)
|
|
|
|
go func() {
|
|
for _msg := range messages {
|
|
imapw.seqMap[_msg.SeqNum-1] = _msg.Uid
|
|
switch msg.(type) {
|
|
case *types.FetchMessageHeaders:
|
|
imapw.worker.PostMessage(&types.MessageInfo{
|
|
Message: types.RespondTo(msg),
|
|
BodyStructure: _msg.BodyStructure,
|
|
Envelope: _msg.Envelope,
|
|
Flags: _msg.Flags,
|
|
InternalDate: _msg.InternalDate,
|
|
Uid: _msg.Uid,
|
|
}, nil)
|
|
case *types.FetchFullMessages:
|
|
reader := _msg.GetBody(section)
|
|
imapw.worker.PostMessage(&types.FullMessage{
|
|
Message: types.RespondTo(msg),
|
|
Reader: reader,
|
|
Uid: _msg.Uid,
|
|
}, nil)
|
|
case *types.FetchMessageBodyPart:
|
|
reader := _msg.GetBody(section)
|
|
imapw.worker.PostMessage(&types.MessageBodyPart{
|
|
Message: types.RespondTo(msg),
|
|
Reader: reader,
|
|
Uid: _msg.Uid,
|
|
}, nil)
|
|
}
|
|
}
|
|
}()
|
|
|
|
if err := imapw.client.UidFetch(uids, items, messages); err != nil {
|
|
imapw.worker.PostMessage(&types.Error{
|
|
Message: types.RespondTo(msg),
|
|
Error: err,
|
|
}, nil)
|
|
} else {
|
|
imapw.worker.PostMessage(
|
|
&types.Done{types.RespondTo(msg)}, nil)
|
|
}
|
|
}
|