Name the test group in English

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index a4041f1b10ff7feb555972aca563662c128ee2da..a2893387ec3240423d6497b22bfcc4c8830e73f3 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -27,8 +27,10 @@ const (
 
 // daemon runs "onechat daemon": it owns the root agent and its files and serves
 // the clients on the Unix socket in the data directory until ctx ends. When
 
 // daemon runs "onechat daemon": it owns the root agent and its 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 holds the lock of the
-// token file, so it is the only process that refreshes the tokens.
+// telegram.json exists, it also runs the Telegram bot. It also keeps a linked
+// WhatsApp device connected. It holds the lock of the token file, so it is the
+// only process that refreshes the tokens and opens the WhatsApp session. Its
+// log lines go to out, through the loggers of daemonLogger.

 func daemon(ctx context.Context, out io.Writer) (err error) {
        dir, err := dataDir()
        if err != nil {
 func daemon(ctx context.Context, out io.Writer) (err error) {
        dir, err := dataDir()
        if err != nil {


@@ -62,6 +64,17 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                err = errors.Join(err, tokens.Close())
        }()
 
                err = errors.Join(err, tokens.Close())
        }()
 

+       whatsappSetDeviceProps()
+       logger := daemonLogger(out, "onechat: ")
+       whatsapp, err := openWhatsApp(ctx, dir, time.Now, daemonLogger(out, "whatsapp: "), whatsappNewClient)
+       if err != nil {
+               return err
+       }
+
+       defer func() {
+               err = errors.Join(err, whatsapp.Close())
+       }()
+

        address, auth, err := modelEndpoint(config, dir)
        if err != nil {
                return err
        address, auth, err := modelEndpoint(config, dir)
        if err != nil {
                return err


@@ -73,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"))
        }
 
        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
        }
        if err != nil {
                return err
        }


@@ -82,6 +95,11 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                err = errors.Join(err, memory.Close())
        }()
 
                err = errors.Join(err, memory.Close())
        }()
 

+       schedules, err := openSchedules(filepath.Join(agent.dir, scheduleFileName), time.Now, logger)
+       if err != nil {
+               return err
+       }
+

        subagents := newSubagents(filepath.Join(agent.dir, subagentDirName), time.Now, subagentNameRandom)
        defer func() {
                err = errors.Join(err, subagents.Close())
        subagents := newSubagents(filepath.Join(agent.dir, subagentDirName), time.Now, subagentNameRandom)
        defer func() {
                err = errors.Join(err, subagents.Close())


@@ -92,27 +110,29 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                return err
        }
 
                return err
        }
 

-       _, err = fmt.Fprintf(out, "onechat: %s on %s, %s at %s effort, in %s\n", agent.config.Name, listener.Addr(), agent.config.Model, agent.config.Effort, agent.config.Workdir)
-       if err != nil {
-               return errors.Join(err, listener.Close())
+       linked := "WhatsApp not linked"
+       if whatsapp.isLinked() {
+               linked = "WhatsApp linked"

        }
 
        }
 

+       logger.Printf("ready: socket %s, model %s (%s), workdir %s, %s, %d schedules", listener.Addr(), agent.config.Model, agent.config.Effort, agent.config.Workdir, linked, schedules.Len())
+

        var telegram *TelegramBot
        if hasBot {
        var telegram *TelegramBot
        if hasBot {

-               telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), log.New(out, "telegram: ", log.LstdFlags))
-               _, err = fmt.Fprintln(out, "onechat: the Telegram bot waits for messages of its owner")
-               if err != nil {
-                       return errors.Join(err, listener.Close())
-               }
+               telegram = newTelegramBot(newTelegramAPI(telegramAPIURL, botSettings.Token), botSettings.Owner, filepath.Join(agent.dir, telegramOffsetFileName), daemonLogger(out, "telegram: "))
+               logger.Print("Telegram bot started")

        }
 
        }
 

-       return daemonServe(ctx, listener, telegram, func(notify func(Event)) (*TurnLoop, error) {
-               return newTurnLoop(agent, memory, subagents, client, time.Now, notify)
+       return daemonServe(ctx, listener, telegram, whatsapp, schedules, func(notify func(Event)) (*TurnLoop, error) {
+               return newTurnLoop(agent, memory, subagents, whatsapp, schedules, client, time.Now, logger, notify)

        })
 }
 
        })
 }
 

-// DaemonHub holds the connected clients and sends each event to all of them.
+// DaemonHub holds the connected clients and sends each event to all of them. It
+// runs the WhatsApp commands of the clients on whatsapp.

 type DaemonHub struct {
 type DaemonHub struct {

+       whatsapp *WhatsApp
+

        mutex   sync.Mutex
        clients map[*DaemonClient]bool
        workers sync.WaitGroup
        mutex   sync.Mutex
        clients map[*DaemonClient]bool
        workers sync.WaitGroup


@@ -178,7 +198,12 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop)
                var request SocketRequest
                err := json.Unmarshal(scanner.Bytes(), &request)
                if err == nil {
                var request SocketRequest
                err := json.Unmarshal(scanner.Bytes(), &request)
                if err == nil {

-                       err = daemonRunRequest(l, request)
+                       err = daemonRunRequest(l, h.whatsapp, request, func(text string) {
+                               h.Send(client, Event{
+                                       Kind: "notice",
+                                       Text: text,
+                               })
+                       })

                }
 
                if err != nil {
                }
 
                if err != nil {


@@ -287,14 +312,18 @@ func daemonListenSocket(path string) (net.Listener, error) {
 }
 
 // daemonServe runs the loop that start makes and serves the clients of listener
 }
 
 // daemonServe runs the loop that start makes and serves the clients of listener

-// until ctx ends or the loop fails. It closes listener. When bot is not nil, it
-// runs the bot too, and a failure of the bot stops the agent.
-func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, start func(notify func(Event)) (*TurnLoop, error)) error {
+// until ctx ends or the loop fails. It closes listener. It runs whatsapp, which
+// logs its batches and notes in the loop and tells all clients its notices, and
+// a failure of whatsapp stops the agent. It runs schedules, which log their
+// runs in the loop, and a failure of schedules stops the agent too. When bot is
+// not nil, it runs the bot too, and a failure of the bot stops the agent.
+func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, whatsapp *WhatsApp, schedules *Schedules, start func(notify func(Event)) (*TurnLoop, error)) error {

        ctx, cancel := context.WithCancel(ctx)
        defer cancel()
 
        hub := &DaemonHub{
        ctx, cancel := context.WithCancel(ctx)
        defer cancel()
 
        hub := &DaemonHub{

-               clients: make(map[*DaemonClient]bool),
+               whatsapp: whatsapp,
+               clients:  make(map[*DaemonClient]bool),

        }
 
        notify := hub.Broadcast
        }
 
        notify := hub.Broadcast


@@ -311,20 +340,37 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, s
        }
 
        var workers sync.WaitGroup
        }
 
        var workers sync.WaitGroup

-       workers.Add(1)
+       workers.Add(2)

        go func() {
                defer workers.Done()
 
                hub.Accept(ctx, listener, l)
        }()
 
        go func() {
                defer workers.Done()
 
                hub.Accept(ctx, listener, l)
        }()
 

+       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()
 
        var botErr error
        if bot != nil {
                workers.Add(1)
                go func() {
                        defer workers.Done()
 

-                       botErr = bot.Run(ctx, l)
+                       botErr = bot.Run(ctx, l, whatsapp)

                        cancel()
                }()
        }
                        cancel()
                }()
        }


@@ -339,11 +385,12 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, s
        hub.CloseAll()
        workers.Wait()
 
        hub.CloseAll()
        workers.Wait()
 

-       return errors.Join(err, botErr)
+       return errors.Join(err, whatsappErr, schedulesErr, botErr)

 }
 
 }
 

-// daemonRunRequest runs one request of a client.
-func daemonRunRequest(l *TurnLoop, request SocketRequest) error {
+// 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 == "" {
        switch request.Type {
        case "send":
                if request.Text == "" {


@@ -358,6 +405,10 @@ func daemonRunRequest(l *TurnLoop, request SocketRequest) error {
                        return errors.New("no turn runs")
                }
 
                        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)
                return nil
        case "stop":
                found, err := l.StopSubagent(request.Text)


@@ -370,3 +421,25 @@ func daemonRunRequest(l *TurnLoop, request SocketRequest) error {
                return fmt.Errorf("unknown request %q", request.Type)
        }
 }
                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()
+}