HTTP API: register, list and remove webhooks, kept across restarts (closes #6)
check / check (push) Successful in 1m2s
check / check (push) Successful in 1m2s
POST, GET and DELETE under /api/v1/chats/{id}/webhooks, for the chats
that GET /api/v1/chats lists. The webhooks are kept in
$DATA_DIR/webhooks.json, mode 0600, which each change replaces whole
through a temporary file in the same directory and a rename. bot.Run
reads the file before it starts the chat client: absent means none, and
a file that cannot be read aborts startup. Reading a JSON request body
moved into decodeBody, which the messages endpoint now shares. Nothing
is posted to a webhook yet.
Model: opus-5-5
This commit is contained in:
+19
-11
@@ -54,12 +54,12 @@ const (
|
||||
|
||||
var errExited = errors.New("simplex-chat exited")
|
||||
|
||||
// Run starts the chat client with its database in cfg.DataDir, serving
|
||||
// its API on localhost at chatPort, connects to it, sets up the bot's
|
||||
// address, then answers messages and serves the bot's API until ctx is
|
||||
// cancelled — which is a clean stop and returns nil — or until the chat
|
||||
// client, the connection to it or the API's listener fails, which
|
||||
// returns the error.
|
||||
// Run reads the webhooks kept in cfg.DataDir, starts the chat client with
|
||||
// its database there, serving its API on localhost at chatPort, connects
|
||||
// to it, sets up the bot's address, then answers messages and serves the
|
||||
// bot's API until ctx is cancelled — which is a clean stop and returns
|
||||
// nil — or until the chat client, the connection to it or the API's
|
||||
// listener fails, which returns the error.
|
||||
func Run(
|
||||
ctx context.Context, log *slog.Logger, cfg *config.Config, chatPort int,
|
||||
) error {
|
||||
@@ -68,6 +68,13 @@ func Run(
|
||||
return fmt.Errorf("creating data directory: %w", err)
|
||||
}
|
||||
|
||||
// Before the chat client starts, so that a file that cannot be read
|
||||
// stops the bot as configuration that cannot be read does.
|
||||
webhooks, err := api.ReadWebhooks(cfg.DataDir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Cancelling this stops the chat client; the deferred wait makes
|
||||
// Run return only once it has exited, whatever path Run takes.
|
||||
// Cancelling ctx does not reach it, so that the API, stopped first,
|
||||
@@ -100,11 +107,12 @@ func Run(
|
||||
}
|
||||
|
||||
srv := api.New(api.Params{
|
||||
Log: log,
|
||||
Client: client,
|
||||
UserID: user.UserID,
|
||||
Port: cfg.Port,
|
||||
Token: cfg.APIToken,
|
||||
Log: log,
|
||||
Client: client,
|
||||
UserID: user.UserID,
|
||||
Port: cfg.Port,
|
||||
Token: cfg.APIToken,
|
||||
Webhooks: webhooks,
|
||||
})
|
||||
|
||||
served := make(chan error, 1)
|
||||
|
||||
Reference in New Issue
Block a user