Show the WhatsApp link with /whatsapp status

[onechat] / daemon.go

diff --git a/daemon.go b/daemon.go
index 9d8402ad024de807b70ddfdfabbe4531d864e5a7..d67c5be60c663aa9f712de3ac5819776a2ff3785 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -27,8 +27,9 @@ 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.

 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 +63,15 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                err = errors.Join(err, tokens.Close())
        }()
 
                err = errors.Join(err, tokens.Close())
        }()
 

+       whatsapp, err := openWhatsApp(ctx, dir, time.Now, log.New(out, "whatsapp: ", log.LstdFlags), 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


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

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

        listener, err := daemonListenSocket(socket)
        if err != nil {
                return err
        listener, err := daemonListenSocket(socket)
        if err != nil {
                return err


@@ -101,13 +116,16 @@ func daemon(ctx context.Context, out io.Writer) (err error) {
                }
        }
 
                }
        }
 

-       return daemonServe(ctx, listener, telegram, func(notify func(Event)) (*loop, error) {
-               return newLoop(agent, memory, client, time.Now, notify)
+       return daemonServe(ctx, listener, telegram, whatsapp, func(notify func(Event)) (*TurnLoop, error) {
+               return newTurnLoop(agent, memory, subagents, client, time.Now, 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


@@ -116,7 +134,7 @@ type DaemonHub struct {
 // 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 *loop) {
+func (h *DaemonHub) Accept(ctx context.Context, listener net.Listener, l *TurnLoop) {

        for {
                conn, err := listener.Accept()
                if err != nil {
        for {
                conn, err := listener.Accept()
                if err != nil {


@@ -163,7 +181,7 @@ func (h *DaemonHub) write(client *DaemonClient) {
 }
 
 // read runs the requests of client until it closes its connection.
 }
 
 // read runs the requests of client until it closes its connection.

-func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *loop) {
+func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *TurnLoop) {

        defer h.workers.Done()
        defer h.drop(client)
 
        defer h.workers.Done()
        defer h.drop(client)
 


@@ -173,7 +191,12 @@ func (h *DaemonHub) read(ctx context.Context, client *DaemonClient, l *loop) {
                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 {


@@ -282,14 +305,16 @@ 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)) (*loop, error)) error {
+// until ctx ends or the loop fails. It closes listener. It keeps whatsapp
+// connected. 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, 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


@@ -306,20 +331,26 @@ 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)
        }()
 

+       go func() {
+               defer workers.Done()
+
+               whatsapp.Run(ctx)
+       }()
+

        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()
                }()
        }


@@ -337,8 +368,9 @@ func daemonServe(ctx context.Context, listener net.Listener, bot *TelegramBot, s
        return errors.Join(err, botErr)
 }
 
        return errors.Join(err, botErr)
 }
 

-// daemonRunRequest runs one request of a client.
-func daemonRunRequest(l *loop, 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 == "" {


@@ -354,6 +386,17 @@ func daemonRunRequest(l *loop, request SocketRequest) error {
                }
 
                return nil
                }
 
                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)
        }
        default:
                return fmt.Errorf("unknown request %q", request.Type)
        }