Connect to IMAP server, login and idle

This commit is contained in:
emersion 2018-01-14 11:30:11 +01:00 committed by Drew DeVault
parent 4074445cbb
commit 1710c90548
3 changed files with 114 additions and 11 deletions

View File

@ -26,6 +26,7 @@ func NewAccountTab(conf *config.AccountConfig) (*AccountTab, error) {
} }
go work.Run() go work.Run()
work.PostAction(types.Configure{Config: conf}) work.PostAction(types.Configure{Config: conf})
work.PostAction(types.Connect{})
return &AccountTab{ return &AccountTab{
Config: conf, Config: conf,
Worker: work, Worker: work,

View File

@ -1,20 +1,43 @@
package imap package imap
import ( import (
"time" "fmt"
"net/url"
"strings"
"git.sr.ht/~sircmpwn/aerc2/worker/types" "git.sr.ht/~sircmpwn/aerc2/worker/types"
"github.com/emersion/go-imap"
"github.com/emersion/go-imap/client"
"github.com/emersion/go-imap-idle"
) )
var errUnsupported = fmt.Errorf("unsupported command")
type imapClient struct {
*client.Client
*idle.IdleClient
}
type IMAPWorker struct { type IMAPWorker struct {
messages chan types.WorkerMessage messages chan types.WorkerMessage
actions chan types.WorkerMessage actions chan types.WorkerMessage
config struct {
scheme string
insecure bool
addr string
user *url.Userinfo
}
client *imapClient
updates chan client.Update
} }
func NewIMAPWorker() *IMAPWorker { func NewIMAPWorker() *IMAPWorker {
return &IMAPWorker{ return &IMAPWorker{
messages: make(chan types.WorkerMessage, 50), messages: make(chan types.WorkerMessage, 50),
actions: make(chan types.WorkerMessage, 50), actions: make(chan types.WorkerMessage, 50),
updates: make(chan client.Update, 50),
} }
} }
@ -26,27 +49,104 @@ func (w *IMAPWorker) PostAction(msg types.WorkerMessage) {
w.actions <- msg w.actions <- msg
} }
func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) { func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
switch msg := msg.(type) { switch msg := msg.(type) {
case types.Ping: case types.Ping:
w.messages <- types.Ack{ // No-op
Message: types.RespondTo(msg), case types.Configure:
u, err := url.Parse(msg.Config.Source)
if err != nil {
return err
} }
w.config.scheme = u.Scheme
if strings.HasSuffix(w.config.scheme, "+insecure") {
w.config.scheme = strings.TrimSuffix(w.config.scheme, "+insecure")
w.config.insecure = true
}
w.config.addr = u.Host
if !strings.ContainsRune(w.config.addr, ':') {
w.config.addr += ":" + u.Scheme
}
w.config.scheme = u.Scheme
w.config.user = u.User
case types.Connect:
// TODO: populate TLS config
var (
c *client.Client
err error
)
switch w.config.scheme {
case "imap":
c, err = client.Dial(w.config.addr)
if err != nil {
return err
}
if !w.config.insecure {
if err := c.StartTLS(nil); err != nil {
return err
}
}
case "imaps":
c, err = client.DialTLS(w.config.addr, nil)
if err != nil {
return err
}
default:
return fmt.Errorf("Unknown IMAP scheme %s", w.config.scheme)
}
if w.config.user != nil {
username := w.config.user.Username()
password, hasPassword := w.config.user.Password()
if !hasPassword {
// TODO: ask password
}
if err := c.Login(username, password); err != nil {
return err
}
}
if _, err := c.Select(imap.InboxName, false); err != nil {
return err
}
c.Updates = w.updates
w.client = &imapClient{c, idle.NewClient(c)}
// TODO: don't idle right away
go w.client.IdleWithFallback(nil, 0)
default: default:
w.messages <- types.Unsupported{ return errUnsupported
Message: types.RespondTo(msg),
}
} }
return nil
} }
func (w *IMAPWorker) Run() { func (w *IMAPWorker) Run() {
// TODO: IMAP shit
for { for {
select { select {
case msg := <-w.actions: case msg := <-w.actions:
w.handleMessage(msg) fmt.Printf("<= %T\n", msg)
default: if err := w.handleMessage(msg); err == errUnsupported {
time.Sleep(100 * time.Millisecond) w.messages <- types.Unsupported{
Message: types.RespondTo(msg),
}
} else if err != nil {
w.messages <- types.Error{
Message: types.RespondTo(msg),
Error: err,
}
} else {
w.messages <- types.Ack{
Message: types.RespondTo(msg),
}
}
case update := <-w.updates:
fmt.Printf("<= %T\n", update)
} }
} }
} }

View File

@ -13,6 +13,7 @@ type Message struct {
} }
// Meta-messages // Meta-messages
type Ack struct { type Ack struct {
Message Message
} }
@ -27,6 +28,7 @@ type Unsupported struct {
} }
// Commands // Commands
type Ping struct { type Ping struct {
Message Message
} }