X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/c781f79f3c8cb9a7577ee1574d196988da2719b3..42b4acd4ba70d3c12da4513d139717e592eefe4a:/daemon.go?ds=sidebyside

diff --git a/daemon.go b/daemon.go
index 9f71d80..a6b08b6 100644
--- a/daemon.go
+++ b/daemon.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bufio"
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -44,9 +45,9 @@ type DaemonClient struct {
 	once   sync.Once
 }
 
-// Accept serves each client of listener until the listener closes. A new
-// client gets a ready event with the name of the agent, and a busy event when a
-// turn runs.
+// Accept serves each client of listener until the listener closes. A new client
+// gets a ready event with the name of the agent, and a busy event when a turn
+// runs.
 func (h *DaemonHub) Accept(ctx context.Context, listener net.Listener, l *TurnLoop) {
 	for {
 		conn, err := listener.Accept()
@@ -108,7 +109,22 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
 
 		err := json.Unmarshal(scanner.Bytes(), &request)
 		if err == nil {
-			if request.Type == "backup" {
+			switch request.Type {
+			case "notify":
+				var receipt Event
+
+				decoder := json.NewDecoder(bytes.NewReader(scanner.Bytes()))
+				decoder.DisallowUnknownFields()
+
+				err = decoder.Decode(&request)
+				if err == nil {
+					receipt, err = l.messages.Notify(request.Notify)
+				}
+
+				if err == nil {
+					h.Send(client, receipt)
+				}
+			case "backup":
 				var size int64
 
 				size, err = backupData(ctx, filepath.Dir(l.agent.dir), request.Text, h.whatsapp, h.snapshot)
@@ -118,7 +134,7 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
 						Text: fmt.Sprintf("%s (%d bytes)", request.Text, size),
 					})
 				}
-			} else {
+			default:
 				err = daemonRunRequest(l, h.whatsapp, request, func(text string) {
 					h.Send(client, Event{
 						Kind: "notice",
@@ -167,14 +183,16 @@ func (h *DaemonHub) send(client *DaemonClient, event Event) {
 	}
 }
 
-// remove removes client, closes its connection, and ends its writer. The
-// caller holds the mutex.
+// remove removes client, closes its connection, and ends its writer. The caller
+// holds the mutex.
 func (h *DaemonHub) remove(client *DaemonClient) {
 	delete(h.clients, client)
 	client.once.Do(func() {
 		close(client.events)
 
-		_ = client.conn.Close()
+		// The client is removed already, so a close failure cannot
+		// restore it.
+		client.conn.Close() // nolint: errcheck
 	})
 }
 
@@ -201,6 +219,68 @@ func (h *DaemonHub) CloseAll() {
 	h.workers.Wait()
 }
 
+// daemonRunRequest runs one request of a client. The answers of a WhatsApp
+// command go to answer.
+func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, answer func(text string)) error {
+	switch request.Type {
+	case "send":
+		if request.Text == "" {
+			return errors.New("empty message")
+		}
+
+		_, err := l.Submit(terminalSource, request.Text)
+		if err != nil {
+			return fmt.Errorf("submit terminal message: %w", err)
+		}
+
+		return nil
+	case "image":
+		if !filepath.IsAbs(request.Path) {
+			return errors.New("use /image PATH [caption]")
+		}
+
+		data, err := imageReadFile(request.Path)
+		if err != nil {
+			return fmt.Errorf("read terminal image: %w", err)
+		}
+
+		name, err := l.agent.Images().Save(data)
+		if err != nil {
+			return fmt.Errorf("store terminal image: %w", err)
+		}
+
+		_, err = l.Submit(terminalSource, imageText([]string{name}, request.Text))
+		if err != nil {
+			return fmt.Errorf("submit terminal image: %w", err)
+		}
+
+		return nil
+	case "interrupt":
+		if !l.Interrupt() {
+			return errors.New("no turn runs")
+		}
+
+		return nil
+	case "whatsapp":
+		whatsapp.Command(request.Text, answer)
+
+		return nil
+	case "stop":
+		found, err := l.StopSubagent(request.Text)
+		if err == nil && !found {
+			err = fmt.Errorf("no subagent %s runs", request.Text)
+		}
+
+		if err != nil {
+			return fmt.Errorf("stop subagent: %w", err)
+		}
+
+		return nil
+	default:
+		return fmt.Errorf("unknown request %q", request.Type)
+	}
+}
+
 // daemon runs "onechat daemon": it owns the root, its children, and their
 // files, and serves the clients on the Unix socket in the data directory until
 // ctx ends. When telegram.json exists, it also runs the Telegram bot. It also
@@ -211,7 +291,7 @@ func (h *DaemonHub) CloseAll() {
 func daemon(ctx context.Context, out io.Writer) (err error) {
 	dir, err := dataDir()
 	if err != nil {
-		return err
+		return fmt.Errorf("find data directory: %w", err)
 	}
 
 	// Check the socket path before the daemon writes a file, so that a data
@@ -219,22 +299,22 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 	socket := filepath.Join(dir, socketFileName)
 	err = checkSocketPath(socket)
 	if err != nil {
-		return err
+		return fmt.Errorf("check daemon socket path: %w", err)
 	}
 
 	config, err := loadConfig(dir)
 	if err != nil {
-		return err
+		return fmt.Errorf("load daemon config: %w", err)
 	}
 
 	botSettings, hasBot, err := loadTelegramConfig(dir)
 	if err != nil {
-		return err
+		return fmt.Errorf("load Telegram config: %w", err)
 	}
 
 	tokens, err := lockTokens(dir)
 	if err != nil {
-		return err
+		return fmt.Errorf("lock login tokens: %w", err)
 	}
 
 	defer func() {
@@ -246,7 +326,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 	logger := daemonLogger(out, "onechat: ")
 	whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
 	if err != nil {
-		return err
+		return fmt.Errorf("open WhatsApp: %w", err)
 	}
 
 	defer func() {
@@ -255,12 +335,12 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 
 	address, auth, err := modelEndpoint(config, dir)
 	if err != nil {
-		return err
+		return fmt.Errorf("configure model endpoint: %w", err)
 	}
 
 	agents, err := openDaemonAgents(ctx, dir, address, auth, config.Compactor, time.Now, logger)
 	if err != nil {
-		return err
+		return fmt.Errorf("open daemon agents: %w", err)
 	}
 
 	defer func() {
@@ -275,7 +355,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 
 	listener, err := daemonListenSocket(socket)
 	if err != nil {
-		return err
+		return fmt.Errorf("listen for daemon clients: %w", err)
 	}
 
 	linked := "not linked"
@@ -295,9 +375,14 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 		logger.Info("Telegram bot started")
 	}
 
-	return daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
+	err = daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
 		return root.Loop(whatsapp, notify)
 	}, agents[1:]...)
+	if err != nil {
+		return fmt.Errorf("serve daemon: %w", err)
+	}
+
+	return nil
 }
 
 // daemonListenSocket listens on the Unix socket at path, with mode 0600. The
@@ -306,7 +391,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 func daemonListenSocket(path string) (net.Listener, error) {
 	err := checkSocketPath(path)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("check daemon socket path: %w", err)
 	}
 
 	err = os.Remove(path)
@@ -489,58 +574,3 @@ func daemonRunChild(ctx context.Context, loop *TurnLoop, schedules *Schedules) e
 
 	return errors.Join(err, <-done)
 }
-
-// daemonRunRequest runs one request of a client. The answers of a WhatsApp
-// command go to answer.
-func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, answer func(text string)) error {
-	switch request.Type {
-	case "send":
-		if request.Text == "" {
-			return errors.New("empty message")
-		}
-
-		_, err := l.Submit(terminalSource, request.Text)
-
-		return err
-	case "image":
-		if !filepath.IsAbs(request.Path) {
-			return errors.New("use /image PATH [caption]")
-		}
-
-		data, err := imageReadFile(request.Path)
-		if err != nil {
-			return fmt.Errorf("read terminal image: %w", err)
-		}
-
-		name, err := l.agent.Images().Save(data)
-		if err != nil {
-			return fmt.Errorf("store terminal image: %w", err)
-		}
-
-		_, err = l.Submit(terminalSource, imageText([]string{name}, request.Text))
-		if err != nil {
-			return fmt.Errorf("submit terminal image: %w", err)
-		}
-
-		return nil
-	case "interrupt":
-		if !l.Interrupt() {
-			return errors.New("no turn runs")
-		}
-
-		return nil
-	case "whatsapp":
-		whatsapp.Command(request.Text, answer)
-
-		return nil
-	case "stop":
-		found, err := l.StopSubagent(request.Text)
-		if err == nil && !found {
-			err = fmt.Errorf("no subagent %s runs", request.Text)
-		}
-
-		return err
-	default:
-		return fmt.Errorf("unknown request %q", request.Type)
-	}
-}