mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Port existing functionality to go-imap v2

Browse source
This commit is contained in:
fox.cpp 2021-07-18 11:20:13 +03:00
parent ef63383248
commit 2e81d5a976
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
9 changed files with 102 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/updatepipe/unix_pipe.go
View file

@ -25,7 +25,7 @@ import (
"net"
"os"
"github.com/emersion/go-imap/backend"
mess "github.com/foxcpp/go-imap-mess"
"github.com/foxcpp/maddy/framework/log"
)
@ -34,11 +34,9 @@ import (
// Listen goroutine can be running.
//
// The socket is stream-oriented and consists of the following messages:
// OBJ_ID;TYPE_NAME;USER;MAILBOX;JSON_SERIALIZED_INTERNAL_OBJECT\n
// SENDER_ID;JSON_SERIALIZED_INTERNAL_OBJECT\n
//
// Where TYPE_NAME is one of the folow: ExpungeUpdate, MailboxUpdate,
// MessageUpdate.
// And OBJ_ID is Process ID and UnixSockPipe address concated as a string.
// And SENDER_ID is Process ID and UnixSockPipe address concated as a string.
// It is used to deduplicate updates sent to Push and recevied via Listen.
//
// The SockPath field specifies the socket path to use. The actual socket
@ -57,7 +55,7 @@ func (usp *UnixSockPipe) myID() string {
return fmt.Sprintf("%d-%p", os.Getpid(), usp)
}
func (usp *UnixSockPipe) readUpdates(conn net.Conn, updCh chan<- backend.Update) {
func (usp *UnixSockPipe) readUpdates(conn net.Conn, updCh chan<- mess.Update) {
scnr := bufio.NewScanner(conn)
for scnr.Scan() {
id, upd, err := parseUpdate(scnr.Text())
@ -70,17 +68,11 @@ func (usp *UnixSockPipe) readUpdates(conn net.Conn, updCh chan<- backend.Update)
continue
}
updCh <- upd
updCh <- *upd
}
}
func (usp *UnixSockPipe) Wrap(upd <-chan backend.Update) chan backend.Update {
ourUpds := make(chan backend.Update, cap(upd))
return ourUpds
}
func (usp *UnixSockPipe) Listen(upd chan<- backend.Update) error {
func (usp *UnixSockPipe) Listen(upd chan<- mess.Update) error {
l, err := net.Listen("unix", usp.SockPath)
if err != nil {
return err
@ -108,7 +100,7 @@ func (usp *UnixSockPipe) InitPush() error {
return nil
}
func (usp *UnixSockPipe) Push(upd backend.Update) error {
func (usp *UnixSockPipe) Push(upd mess.Update) error {
if usp.sender == nil {
if err := usp.InitPush(); err != nil {
return err