1
0
mirror of https://git.sr.ht/~sircmpwn/aerc synced 2024-11-23 08:32:12 +01:00
aerc/lib/socket.go
Heiko Carrasco 70c16fc346 Print success to socket if no error was thrown
When Reto Brunners patch is applied (which works really well for me), the user gets to see the message
returned by AercServer. Since this is nil if no errors were thrown it
prints "result: <nil>" to the cmd. This patch fixes that by just
returning success instead of the error message when err != nil.
2019-09-29 12:36:34 -04:00

104 lines
2.2 KiB
Go

package lib
import (
"bufio"
"errors"
"fmt"
"log"
"net"
"net/url"
"path"
"strings"
"sync/atomic"
"time"
"github.com/kyoh86/xdg"
)
type AercServer struct {
logger *log.Logger
listener net.Listener
OnMailto func(addr *url.URL) error
}
func StartServer(logger *log.Logger) (*AercServer, error) {
sockpath := path.Join(xdg.RuntimeDir(), "aerc.sock")
l, err := net.Listen("unix", sockpath)
if err != nil {
return nil, err
}
as := &AercServer{
logger: logger,
listener: l,
}
// TODO: stash clients and close them on exit... bleh racey
go func() {
for {
conn, err := l.Accept()
if err != nil {
// TODO: Something more useful, in some cases, on wednesdays,
// after 2 PM, I guess?
as.logger.Printf("Closing Unix server: %v", err)
return
}
go as.handleClient(conn)
}
}()
return as, nil
}
func (as *AercServer) Close() {
as.listener.Close()
}
var lastId int64 = 0 // access via atomic
func (as *AercServer) handleClient(conn net.Conn) {
clientId := atomic.AddInt64(&lastId, 1)
as.logger.Printf("Accepted Unix connection %d", clientId)
scanner := bufio.NewScanner(conn)
conn.SetDeadline(time.Now().Add(1 * time.Minute))
for scanner.Scan() {
conn.SetDeadline(time.Now().Add(1 * time.Minute))
msg := scanner.Text()
if !strings.ContainsRune(msg, ':') {
conn.Write([]byte("error: invalid command\n"))
}
as.logger.Printf("unix:%d: got message %s", clientId, msg)
prefix := msg[:strings.IndexRune(msg, ':')]
switch prefix {
case "mailto":
mailto, err := url.Parse(msg)
if err != nil {
conn.Write([]byte(fmt.Sprintf("error: %v\n", err)))
break
}
if as.OnMailto != nil {
err = as.OnMailto(mailto)
}
if err != nil {
conn.Write([]byte(fmt.Sprintf("result: %v\n", err)))
} else {
conn.Write([]byte(fmt.Sprint("result: success\n")))
}
}
}
as.logger.Printf("Closed Unix connection %d", clientId)
}
func ConnectAndExec(msg string) error {
sockpath := path.Join(xdg.RuntimeDir(), "aerc.sock")
conn, err := net.Dial("unix", sockpath)
if err != nil {
return err
}
conn.Write([]byte(msg + "\n"))
scanner := bufio.NewScanner(conn)
if !scanner.Scan() {
return errors.New("No response from server")
}
result := scanner.Text()
fmt.Println(result)
return nil
}