X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/5b778ad04422dd456b7d673fb653f0353c47b0fe..0bc8db71aa5d2c55b215a7a15b073bb85a1172eb:/daemon.go?ds=sidebyside

diff --git a/daemon.go b/daemon.go
index 3f67a0b..ef73896 100644
--- a/daemon.go
+++ b/daemon.go
@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"os"
 	"path/filepath"
@@ -65,6 +64,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 	}()
 
 	whatsappSetDeviceProps()
+
 	logger := daemonLogger(out, "onechat: ")
 	whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
 	if err != nil {
@@ -86,7 +86,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 	}
 
 	client := newModelClient(address, auth, agent.CacheKey(), filepath.Join(agent.dir, "usage.jsonl"))
-	memory, err := openMemory(ctx, agent.dir, time.Now, newCompactor(client, agent.Prompt, config.Compactor))
+	memory, err := openMemory(ctx, agent.dir, time.Now, newCompactor(client, agent.Prompt, config.Compactor), logger)
 	if err != nil {
 		return err
 	}
@@ -95,7 +95,7 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 		err = errors.Join(err, memory.Close())
 	}()
 
-	schedules, err := openSchedules(filepath.Join(agent.dir, scheduleFileName), time.Now)
+	schedules, err := openSchedules(filepath.Join(agent.dir, scheduleFileName), time.Now, logger)
 	if err != nil {
 		return err
 	}
@@ -110,17 +110,19 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
 		return err
 	}
 
-	linked := "WhatsApp is not linked"
+	linked := "not linked"
 	if whatsapp.isLinked() {
-		linked = "WhatsApp is linked"
+		linked = "linked"
 	}
 
-	logger.Printf("%s is ready: socket %s, model %s at %s effort, commands run in %s, %s, active schedules: %d", agent.config.Name, listener.Addr(), agent.config.Model, agent.config.Effort, agent.config.Workdir, linked, schedules.Len())
+	logger.Info("ready", "socket", listener.Addr(), "model", agent.config.Model, "effort", agent.config.Effort, "workdir", agent.config.Workdir, "whatsapp", linked, "schedules", schedules.Len())
 
 	var telegram *TelegramBot
+
 	if hasBot {
 		telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), daemonLogger(out, "telegram: "))
-		logger.Print("the Telegram bot waits for messages of its owner")
+
+		logger.Info("Telegram bot started")
 	}
 
 	return daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
@@ -154,10 +156,12 @@ func (h *DaemonHub) Accept(ctx context.Context, listener net.Listener, l *TurnLo
 		}
 
 		h.mutex.Lock()
+
 		h.clients[client] = true
 		h.mutex.Unlock()
 
 		h.workers.Add(2)
+
 		go h.write(client)
 		go h.read(ctx, client, l)
 
@@ -194,8 +198,10 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
 
 	scanner := bufio.NewScanner(client.conn)
 	scanner.Buffer(make([]byte, 64*1024), socketRequestBytes)
+
 	for ctx.Err() == nil && scanner.Scan() {
 		var request SocketRequest
+
 		err := json.Unmarshal(scanner.Bytes(), &request)
 		if err == nil {
 			err = daemonRunRequest(l, h.whatsapp, request, func(text string) {
@@ -251,6 +257,7 @@ func (h *DaemonHub) remove(client *DaemonClient) {
 	delete(h.clients, client)
 	client.once.Do(func() {
 		close(client.events)
+
 		_ = client.conn.Close()
 	})
 }
@@ -268,9 +275,11 @@ func (h *DaemonHub) Broadcast(event Event) {
 // CloseAll drops every client and waits for their readers and writers.
 func (h *DaemonHub) CloseAll() {
 	h.mutex.Lock()
+
 	for client := range h.clients {
 		h.remove(client)
 	}
+
 	h.mutex.Unlock()
 
 	h.workers.Wait()
@@ -340,7 +349,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
 	}
 
 	var workers sync.WaitGroup
+
 	workers.Add(2)
+
 	go func() {
 		defer workers.Done()
 
@@ -348,29 +359,37 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
 	}()
 
 	var whatsappErr error
+
 	go func() {
 		defer workers.Done()
 
 		whatsappErr = whatsapp.Run(ctx, l, notify)
+
 		cancel()
 	}()
 
 	var schedulesErr error
+
 	workers.Add(1)
+
 	go func() {
 		defer workers.Done()
 
 		schedulesErr = schedules.Run(ctx, l)
+
 		cancel()
 	}()
 
 	var botErr error
+
 	if bot != nil {
 		workers.Add(1)
+
 		go func() {
 			defer workers.Done()
 
 			botErr = bot.Run(ctx, l, whatsapp)
+
 			cancel()
 		}()
 	}
@@ -381,7 +400,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, w
 	}
 
 	cancel()
+
 	err = errors.Join(err, listener.Close())
+
 	hub.CloseAll()
 	workers.Wait()
 
@@ -421,25 +442,3 @@ func daemonRunRequest(l *TurnLoop, whatsapp *WhatsApp, request SocketRequest, an
 		return fmt.Errorf("unknown request %q", request.Type)
 	}
 }
-
-// daemonLogger returns the logger of the part of the daemon with prefix, such
-// as "telegram: ", on out. The journal adds the time to each line and sets
-// JOURNAL_STREAM for a service, so then the lines have no time stamp. Otherwise
-// each line has the standard time stamp.
-func daemonLogger(out io.Writer, prefix string) *log.Logger {
-	if os.Getenv("JOURNAL_STREAM") != "" {
-		return log.New(out, prefix, 0)
-	}
-
-	return log.New(out, prefix, log.LstdFlags)
-}
-
-// durationText returns d for a log line: rounded to the second, or to the
-// millisecond when it is shorter than a second.
-func durationText(d time.Duration) string {
-	if d < time.Second {
-		return d.Round(time.Millisecond).String()
-	}
-
-	return d.Round(time.Second).String()
-}