mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-29 08:04:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26f495ac8e | ||
|
|
9243d020cc |
No files matched your search
+13
-7
@@ -507,13 +507,19 @@ and wired refs, one click or one CLI call.
|
|||||||
deployment history, env-doctor issues surfaced on the service view.
|
deployment history, env-doctor issues surfaced on the service view.
|
||||||
- [x] **env var edit + domain management + replica scaling** (PR #61 —
|
- [x] **env var edit + domain management + replica scaling** (PR #61 —
|
||||||
mobile v1.5: variables editor, domains screen, scale + sleep
|
mobile v1.5: variables editor, domains screen, scale + sleep
|
||||||
settings, notifications tab). **cron execution history** still open.
|
settings, notifications tab, cron jobs screen with run-now and
|
||||||
- [ ] **Push notifications** — zero-infra path = self-hosted
|
execution history).
|
||||||
ntfy/Gotify relay (no Firebase dependency), FCM/APNs optional.
|
- [x] **Push notifications** — per-user `notification_channels`
|
||||||
- [ ] **Offline resilience** — cached last-known state + unreachable
|
(ntfy + Gotify): every `insertUserNotification` fans out best-effort
|
||||||
banner.
|
to enabled channels; CRUD + live test-ping via web settings, CLI
|
||||||
- [ ] **Status/offline resilience** — app + CLI degrade gracefully when
|
`notifications channels`, and MCP. FCM/APNs remain optional.
|
||||||
the instance is unreachable (cached last-known state, clear banner).
|
- [x] **Offline resilience** — AsyncStorage-persisted query cache
|
||||||
|
(7d, high-churn keys excluded) + banner when the instance is
|
||||||
|
unreachable (`/health` ping + expo-network).
|
||||||
|
- [x] **Status/offline resilience** — web persists the query cache to
|
||||||
|
localStorage (24h) and PlatformShell shows a "last-known data" banner
|
||||||
|
on offline/unreachable; CLI exits `ExitUnavailable` with a clean
|
||||||
|
"cannot reach" message (no stack traces).
|
||||||
|
|
||||||
## 10. Carried-over debt (ROADMAP.md items still open)
|
## 10. Carried-over debt (ROADMAP.md items still open)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,225 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
// Push notification channels — self-hosted ntfy and Gotify endpoints users
|
||||||
|
// attach to their account. insertUserNotification fans out best-effort.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"containr/internal/database"
|
||||||
|
"containr/internal/database/sqlcdb"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
// jarvis: ceiling — one shared client; no retry/backoff, delivery is
|
||||||
|
// best-effort and failures are silent by design (notifications must never
|
||||||
|
// break the producing flow).
|
||||||
|
var pushHTTPClient = &http.Client{Timeout: 5 * time.Second}
|
||||||
|
|
||||||
|
type notificationChannelDTO struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Kind string `json:"kind"`
|
||||||
|
Endpoint string `json:"endpoint"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
CreatedAt string `json:"created_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func mapChannel(row sqlcdb.NotificationChannel) notificationChannelDTO {
|
||||||
|
return notificationChannelDTO{
|
||||||
|
ID: row.ID.String(),
|
||||||
|
Kind: row.Kind,
|
||||||
|
Endpoint: row.Endpoint,
|
||||||
|
Enabled: row.Enabled,
|
||||||
|
CreatedAt: row.CreatedAt.Time.Format(time.RFC3339),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleListNotificationChannels(c *gin.Context) {
|
||||||
|
userID, ok := requireAuthenticatedUserID(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
db := c.MustGet("db").(*database.DB)
|
||||||
|
uid, _ := uuid.Parse(userID)
|
||||||
|
rows, err := sqlcdb.New(db.DB).ListAllNotificationChannelsByUser(c.Request.Context(), uid)
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to list channels")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
out := make([]notificationChannelDTO, 0, len(rows))
|
||||||
|
for _, r := range rows {
|
||||||
|
out = append(out, mapChannel(r))
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusOK, gin.H{"channels": out})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleCreateNotificationChannel(c *gin.Context) {
|
||||||
|
userID, ok := requireAuthenticatedUserID(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var req struct {
|
||||||
|
Kind string `json:"kind" binding:"required,oneof=ntfy gotify"`
|
||||||
|
Endpoint string `json:"endpoint" binding:"required"`
|
||||||
|
Token string `json:"token"`
|
||||||
|
}
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
respondError(c, http.StatusBadRequest, "VALIDATION", "kind (ntfy|gotify) and endpoint are required")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
endpoint := strings.TrimRight(strings.TrimSpace(req.Endpoint), "/")
|
||||||
|
u, err := url.Parse(endpoint)
|
||||||
|
if err != nil || u.Scheme == "" || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") {
|
||||||
|
respondError(c, http.StatusBadRequest, "VALIDATION", "endpoint must be a valid http(s) URL")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
db := c.MustGet("db").(*database.DB)
|
||||||
|
uid, _ := uuid.Parse(userID)
|
||||||
|
row, err := sqlcdb.New(db.DB).InsertNotificationChannel(c.Request.Context(), sqlcdb.InsertNotificationChannelParams{
|
||||||
|
UserID: uid,
|
||||||
|
Kind: req.Kind,
|
||||||
|
Endpoint: endpoint,
|
||||||
|
Token: sql.NullString{String: req.Token, Valid: req.Token != ""},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to create channel")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusCreated, gin.H{"channel": mapChannel(row)})
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleDeleteNotificationChannel(c *gin.Context) {
|
||||||
|
userID, ok := requireAuthenticatedUserID(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, err := uuid.Parse(c.Param("id"))
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusBadRequest, "VALIDATION", "Invalid channel id")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
db := c.MustGet("db").(*database.DB)
|
||||||
|
uid, _ := uuid.Parse(userID)
|
||||||
|
n, err := sqlcdb.New(db.DB).DeleteNotificationChannel(c.Request.Context(), sqlcdb.DeleteNotificationChannelParams{
|
||||||
|
ID: id, UserID: uid,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to delete channel")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
respondError(c, http.StatusNotFound, "NOT_FOUND", "Channel not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusOK, gin.H{"message": "Channel deleted"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleTestNotificationChannel pushes a probe notification through the
|
||||||
|
// channel — surfaces misconfiguration before real alerts depend on it.
|
||||||
|
func handleTestNotificationChannel(c *gin.Context) {
|
||||||
|
userID, ok := requireAuthenticatedUserID(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, err := uuid.Parse(c.Param("id"))
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusBadRequest, "VALIDATION", "Invalid channel id")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
db := c.MustGet("db").(*database.DB)
|
||||||
|
uid, _ := uuid.Parse(userID)
|
||||||
|
rows, err := sqlcdb.New(db.DB).ListAllNotificationChannelsByUser(c.Request.Context(), uid)
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusInternalServerError, "INTERNAL_ERROR", "Failed to load channel")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var target *sqlcdb.NotificationChannel
|
||||||
|
for i := range rows {
|
||||||
|
if rows[i].ID == id {
|
||||||
|
target = &rows[i]
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if target == nil {
|
||||||
|
respondError(c, http.StatusNotFound, "NOT_FOUND", "Channel not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := deliverPush(c.Request.Context(), *target, "test", "Containr test notification", "Your push channel is configured correctly."); err != nil {
|
||||||
|
respondError(c, http.StatusBadGateway, "DELIVERY_FAILED", fmt.Sprintf("Push failed: %v", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.JSON(http.StatusOK, gin.H{"message": "Test notification sent"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// deliverPush sends one notification through a channel. ntfy expects the
|
||||||
|
// body at POST {endpoint} with Title/Priority headers; Gotify takes JSON at
|
||||||
|
// POST {endpoint}/message?token=...
|
||||||
|
func deliverPush(ctx context.Context, ch sqlcdb.NotificationChannel, kind, title, body string) error {
|
||||||
|
var req *http.Request
|
||||||
|
var err error
|
||||||
|
switch ch.Kind {
|
||||||
|
case "ntfy":
|
||||||
|
req, err = http.NewRequestWithContext(ctx, http.MethodPost, ch.Endpoint, strings.NewReader(body))
|
||||||
|
if err == nil {
|
||||||
|
req.Header.Set("Title", title)
|
||||||
|
req.Header.Set("Tags", "containr,"+kind)
|
||||||
|
if ch.Token.Valid && ch.Token.String != "" {
|
||||||
|
req.Header.Set("Authorization", "Bearer "+ch.Token.String)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "gotify":
|
||||||
|
payload, _ := json.Marshal(map[string]interface{}{
|
||||||
|
"title": title,
|
||||||
|
"message": body,
|
||||||
|
"priority": 5,
|
||||||
|
})
|
||||||
|
endpoint := ch.Endpoint + "/message"
|
||||||
|
if ch.Token.Valid && ch.Token.String != "" {
|
||||||
|
endpoint += "?token=" + url.QueryEscape(ch.Token.String)
|
||||||
|
}
|
||||||
|
req, err = http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(payload))
|
||||||
|
if err == nil {
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unsupported channel kind %q", ch.Kind)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
res, err := pushHTTPClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer res.Body.Close()
|
||||||
|
if res.StatusCode >= 400 {
|
||||||
|
return fmt.Errorf("push endpoint returned %d", res.StatusCode)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// fanoutUserPush delivers a notification to every enabled channel the user
|
||||||
|
// configured. Errors are swallowed — the in-app row already landed.
|
||||||
|
func fanoutUserPush(db *database.DB, userID, kind, title, body string) {
|
||||||
|
uid, err := uuid.Parse(userID)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rows, err := sqlcdb.New(db.DB).ListNotificationChannelsByUser(context.Background(), uid)
|
||||||
|
if err != nil || len(rows) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, ch := range rows {
|
||||||
|
_ = deliverPush(context.Background(), ch, kind, title, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"containr/internal/database/sqlcdb"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDeliverPushNtfy(t *testing.T) {
|
||||||
|
var gotAuth, gotTitle, gotTags, gotBody string
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
gotAuth = r.Header.Get("Authorization")
|
||||||
|
gotTitle = r.Header.Get("Title")
|
||||||
|
gotTags = r.Header.Get("Tags")
|
||||||
|
b, _ := io.ReadAll(r.Body)
|
||||||
|
gotBody = string(b)
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
ch := sqlcdb.NotificationChannel{
|
||||||
|
Kind: "ntfy",
|
||||||
|
Endpoint: srv.URL + "/alerts",
|
||||||
|
Token: sql.NullString{String: "tk_abc", Valid: true},
|
||||||
|
}
|
||||||
|
if err := deliverPush(context.Background(), ch, "deployment", "Deploy done", "svc is live"); err != nil {
|
||||||
|
t.Fatalf("deliverPush: %v", err)
|
||||||
|
}
|
||||||
|
if gotAuth != "Bearer tk_abc" {
|
||||||
|
t.Fatalf("auth header = %q", gotAuth)
|
||||||
|
}
|
||||||
|
if gotTitle != "Deploy done" || gotTags != "containr,deployment" || gotBody != "svc is live" {
|
||||||
|
t.Fatalf("title=%q tags=%q body=%q", gotTitle, gotTags, gotBody)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeliverPushGotify(t *testing.T) {
|
||||||
|
var gotPath, gotToken string
|
||||||
|
var payload map[string]interface{}
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
gotPath = r.URL.Path
|
||||||
|
gotToken = r.URL.Query().Get("token")
|
||||||
|
_ = json.NewDecoder(r.Body).Decode(&payload)
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
ch := sqlcdb.NotificationChannel{
|
||||||
|
Kind: "gotify",
|
||||||
|
Endpoint: srv.URL,
|
||||||
|
Token: sql.NullString{String: "apptoken", Valid: true},
|
||||||
|
}
|
||||||
|
if err := deliverPush(context.Background(), ch, "backup", "Backup done", "db backup ok"); err != nil {
|
||||||
|
t.Fatalf("deliverPush: %v", err)
|
||||||
|
}
|
||||||
|
if gotPath != "/message" || gotToken != "apptoken" {
|
||||||
|
t.Fatalf("path=%q token=%q", gotPath, gotToken)
|
||||||
|
}
|
||||||
|
if payload["title"] != "Backup done" || payload["message"] != "db backup ok" {
|
||||||
|
t.Fatalf("payload = %v", payload)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeliverPushFailure(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
ch := sqlcdb.NotificationChannel{Kind: "ntfy", Endpoint: srv.URL}
|
||||||
|
if err := deliverPush(context.Background(), ch, "k", "t", "b"); err == nil {
|
||||||
|
t.Fatal("expected error on 500")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,6 +41,7 @@ func insertUserNotification(db *database.DB, userID, kind, title, body, resource
|
|||||||
ResourceID: sql.NullString{String: resourceID, Valid: resourceID != ""},
|
ResourceID: sql.NullString{String: resourceID, Valid: resourceID != ""},
|
||||||
CreatedAt: sql.NullTime{Time: time.Now(), Valid: true},
|
CreatedAt: sql.NullTime{Time: time.Now(), Valid: true},
|
||||||
})
|
})
|
||||||
|
go fanoutUserPush(db, userID, kind, title, body)
|
||||||
}
|
}
|
||||||
|
|
||||||
func mapNotification(row sqlcdb.Notification) NotificationItem {
|
func mapNotification(row sqlcdb.Notification) NotificationItem {
|
||||||
|
|||||||
@@ -364,6 +364,10 @@ func SetupRoutes(router *gin.Engine, db *database.DB, redis *database.Redis, cfg
|
|||||||
authed.GET("/notifications", handleListNotifications)
|
authed.GET("/notifications", handleListNotifications)
|
||||||
authed.POST("/notifications/:id/read", handleMarkNotificationRead)
|
authed.POST("/notifications/:id/read", handleMarkNotificationRead)
|
||||||
authed.POST("/notifications/read-all", handleMarkAllNotificationsRead)
|
authed.POST("/notifications/read-all", handleMarkAllNotificationsRead)
|
||||||
|
authed.GET("/notifications/channels", handleListNotificationChannels)
|
||||||
|
authed.POST("/notifications/channels", handleCreateNotificationChannel)
|
||||||
|
authed.POST("/notifications/channels/:id/test", handleTestNotificationChannel)
|
||||||
|
authed.DELETE("/notifications/channels/:id", handleDeleteNotificationChannel)
|
||||||
|
|
||||||
// WebSocket endpoint
|
// WebSocket endpoint
|
||||||
authed.GET("/ws", handleWebSocket)
|
authed.GET("/ws", handleWebSocket)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -60,6 +62,104 @@ var notifReadCmd = &cobra.Command{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var notifChannelsCmd = &cobra.Command{
|
||||||
|
Use: "channels",
|
||||||
|
Short: "Manage push notification channels (ntfy/Gotify)",
|
||||||
|
}
|
||||||
|
|
||||||
|
var notifChannelsListCmd = &cobra.Command{
|
||||||
|
Use: "list",
|
||||||
|
Short: "List push channels",
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
c, err := client()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
data, err := c.Do("GET", "/notifications/channels", nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
items, err := unwrapList(data, "channels")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
rows := make([][]string, 0, len(items))
|
||||||
|
for _, n := range items {
|
||||||
|
rows = append(rows, []string{
|
||||||
|
str(n, "id"), str(n, "kind"), str(n, "endpoint"), str(n, "enabled"), relTime(n, "created_at"),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
printRows(data, []string{"ID", "KIND", "ENDPOINT", "ENABLED", "AGE"}, rows)
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var notifChannelsAddCmd = &cobra.Command{
|
||||||
|
Use: "add <ntfy|gotify> <endpoint>",
|
||||||
|
Short: "Add a push channel (endpoint includes topic for ntfy)",
|
||||||
|
Args: cobra.ExactArgs(2),
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
c, err := client()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
token, _ := cmd.Flags().GetString("token")
|
||||||
|
data, err := c.Do("POST", "/notifications/channels", map[string]interface{}{
|
||||||
|
"kind": args[0],
|
||||||
|
"endpoint": args[1],
|
||||||
|
"token": token,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
PrintRaw(data)
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var notifChannelsTestCmd = &cobra.Command{
|
||||||
|
Use: "test <id>",
|
||||||
|
Short: "Send a test notification through a channel",
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
c, err := client()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
data, err := c.Do("POST", "/notifications/channels/"+args[0]+"/test", map[string]interface{}{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
PrintRaw(data)
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var notifChannelsRemoveCmd = &cobra.Command{
|
||||||
|
Use: "remove <id>",
|
||||||
|
Short: "Remove a push channel",
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
yes, _ := cmd.Flags().GetBool("yes")
|
||||||
|
if !yes && !Confirm(fmt.Sprintf("Remove channel %s?", args[0])) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
c, err := client()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
data, err := c.Do("DELETE", "/notifications/channels/"+args[0], nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
PrintRaw(data)
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
NotificationsCmd.AddCommand(notifListCmd, notifReadCmd)
|
notifChannelsAddCmd.Flags().String("token", "", "Auth token (ntfy access token or Gotify app token)")
|
||||||
|
notifChannelsRemoveCmd.Flags().Bool("yes", false, "Skip confirmation")
|
||||||
|
notifChannelsCmd.AddCommand(notifChannelsListCmd, notifChannelsAddCmd, notifChannelsTestCmd, notifChannelsRemoveCmd)
|
||||||
|
NotificationsCmd.AddCommand(notifListCmd, notifReadCmd, notifChannelsCmd)
|
||||||
}
|
}
|
||||||
@@ -193,6 +193,17 @@ type Notification struct {
|
|||||||
CreatedAt sql.NullTime `json:"created_at"`
|
CreatedAt sql.NullTime `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type NotificationChannel struct {
|
||||||
|
ID uuid.UUID `json:"id"`
|
||||||
|
UserID uuid.UUID `json:"user_id"`
|
||||||
|
Kind string `json:"kind"`
|
||||||
|
Endpoint string `json:"endpoint"`
|
||||||
|
Token sql.NullString `json:"token"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
CreatedAt sql.NullTime `json:"created_at"`
|
||||||
|
UpdatedAt sql.NullTime `json:"updated_at"`
|
||||||
|
}
|
||||||
|
|
||||||
type OutboundWebhook struct {
|
type OutboundWebhook struct {
|
||||||
ID uuid.UUID `json:"id"`
|
ID uuid.UUID `json:"id"`
|
||||||
UserID uuid.UUID `json:"user_id"`
|
UserID uuid.UUID `json:"user_id"`
|
||||||
|
|||||||
@@ -53,6 +53,135 @@ func (q *Queries) CreateNotification(ctx context.Context, arg CreateNotification
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const deleteNotificationChannel = `-- name: DeleteNotificationChannel :execrows
|
||||||
|
DELETE FROM notification_channels WHERE id = $1 AND user_id = $2
|
||||||
|
`
|
||||||
|
|
||||||
|
type DeleteNotificationChannelParams struct {
|
||||||
|
ID uuid.UUID `json:"id"`
|
||||||
|
UserID uuid.UUID `json:"user_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (q *Queries) DeleteNotificationChannel(ctx context.Context, arg DeleteNotificationChannelParams) (int64, error) {
|
||||||
|
result, err := q.db.ExecContext(ctx, deleteNotificationChannel, arg.ID, arg.UserID)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return result.RowsAffected()
|
||||||
|
}
|
||||||
|
|
||||||
|
const insertNotificationChannel = `-- name: InsertNotificationChannel :one
|
||||||
|
INSERT INTO notification_channels (user_id, kind, endpoint, token)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
RETURNING id, user_id, kind, endpoint, token, enabled, created_at, updated_at
|
||||||
|
`
|
||||||
|
|
||||||
|
type InsertNotificationChannelParams struct {
|
||||||
|
UserID uuid.UUID `json:"user_id"`
|
||||||
|
Kind string `json:"kind"`
|
||||||
|
Endpoint string `json:"endpoint"`
|
||||||
|
Token sql.NullString `json:"token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (q *Queries) InsertNotificationChannel(ctx context.Context, arg InsertNotificationChannelParams) (NotificationChannel, error) {
|
||||||
|
row := q.db.QueryRowContext(ctx, insertNotificationChannel,
|
||||||
|
arg.UserID,
|
||||||
|
arg.Kind,
|
||||||
|
arg.Endpoint,
|
||||||
|
arg.Token,
|
||||||
|
)
|
||||||
|
var i NotificationChannel
|
||||||
|
err := row.Scan(
|
||||||
|
&i.ID,
|
||||||
|
&i.UserID,
|
||||||
|
&i.Kind,
|
||||||
|
&i.Endpoint,
|
||||||
|
&i.Token,
|
||||||
|
&i.Enabled,
|
||||||
|
&i.CreatedAt,
|
||||||
|
&i.UpdatedAt,
|
||||||
|
)
|
||||||
|
return i, err
|
||||||
|
}
|
||||||
|
|
||||||
|
const listAllNotificationChannelsByUser = `-- name: ListAllNotificationChannelsByUser :many
|
||||||
|
SELECT id, user_id, kind, endpoint, token, enabled, created_at, updated_at
|
||||||
|
FROM notification_channels
|
||||||
|
WHERE user_id = $1
|
||||||
|
ORDER BY created_at
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) ListAllNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error) {
|
||||||
|
rows, err := q.db.QueryContext(ctx, listAllNotificationChannelsByUser, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
items := []NotificationChannel{}
|
||||||
|
for rows.Next() {
|
||||||
|
var i NotificationChannel
|
||||||
|
if err := rows.Scan(
|
||||||
|
&i.ID,
|
||||||
|
&i.UserID,
|
||||||
|
&i.Kind,
|
||||||
|
&i.Endpoint,
|
||||||
|
&i.Token,
|
||||||
|
&i.Enabled,
|
||||||
|
&i.CreatedAt,
|
||||||
|
&i.UpdatedAt,
|
||||||
|
); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items = append(items, i)
|
||||||
|
}
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
const listNotificationChannelsByUser = `-- name: ListNotificationChannelsByUser :many
|
||||||
|
SELECT id, user_id, kind, endpoint, token, enabled, created_at, updated_at
|
||||||
|
FROM notification_channels
|
||||||
|
WHERE user_id = $1 AND enabled
|
||||||
|
ORDER BY created_at
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) ListNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error) {
|
||||||
|
rows, err := q.db.QueryContext(ctx, listNotificationChannelsByUser, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
items := []NotificationChannel{}
|
||||||
|
for rows.Next() {
|
||||||
|
var i NotificationChannel
|
||||||
|
if err := rows.Scan(
|
||||||
|
&i.ID,
|
||||||
|
&i.UserID,
|
||||||
|
&i.Kind,
|
||||||
|
&i.Endpoint,
|
||||||
|
&i.Token,
|
||||||
|
&i.Enabled,
|
||||||
|
&i.CreatedAt,
|
||||||
|
&i.UpdatedAt,
|
||||||
|
); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items = append(items, i)
|
||||||
|
}
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
const listNotificationsByUser = `-- name: ListNotificationsByUser :many
|
const listNotificationsByUser = `-- name: ListNotificationsByUser :many
|
||||||
SELECT id, user_id, kind, title, body, resource_type, resource_id, read_at, created_at
|
SELECT id, user_id, kind, title, body, resource_type, resource_id, read_at, created_at
|
||||||
FROM notifications
|
FROM notifications
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ type Querier interface {
|
|||||||
DeleteBanner(ctx context.Context, id uuid.UUID) error
|
DeleteBanner(ctx context.Context, id uuid.UUID) error
|
||||||
DeleteDatabaseServiceByID(ctx context.Context, id string) error
|
DeleteDatabaseServiceByID(ctx context.Context, id string) error
|
||||||
DeleteDatabaseServiceByIDAndUser(ctx context.Context, arg DeleteDatabaseServiceByIDAndUserParams) error
|
DeleteDatabaseServiceByIDAndUser(ctx context.Context, arg DeleteDatabaseServiceByIDAndUserParams) error
|
||||||
|
DeleteNotificationChannel(ctx context.Context, arg DeleteNotificationChannelParams) (int64, error)
|
||||||
DeleteOutboundWebhookByIDAndUser(ctx context.Context, arg DeleteOutboundWebhookByIDAndUserParams) error
|
DeleteOutboundWebhookByIDAndUser(ctx context.Context, arg DeleteOutboundWebhookByIDAndUserParams) error
|
||||||
DeleteProjectByID(ctx context.Context, projectID uuid.UUID) (int64, error)
|
DeleteProjectByID(ctx context.Context, projectID uuid.UUID) (int64, error)
|
||||||
DeleteProjectEnvironment(ctx context.Context, arg DeleteProjectEnvironmentParams) error
|
DeleteProjectEnvironment(ctx context.Context, arg DeleteProjectEnvironmentParams) error
|
||||||
@@ -75,12 +76,14 @@ type Querier interface {
|
|||||||
GetUserInviteByTokenHash(ctx context.Context, tokenHash string) (UserInvite, error)
|
GetUserInviteByTokenHash(ctx context.Context, tokenHash string) (UserInvite, error)
|
||||||
GetUserTokenByHash(ctx context.Context, tokenHash string) (UserToken, error)
|
GetUserTokenByHash(ctx context.Context, tokenHash string) (UserToken, error)
|
||||||
InsertAgentHeartbeat(ctx context.Context, arg InsertAgentHeartbeatParams) error
|
InsertAgentHeartbeat(ctx context.Context, arg InsertAgentHeartbeatParams) error
|
||||||
|
InsertNotificationChannel(ctx context.Context, arg InsertNotificationChannelParams) (NotificationChannel, error)
|
||||||
InsertProjectEnvironment(ctx context.Context, arg InsertProjectEnvironmentParams) error
|
InsertProjectEnvironment(ctx context.Context, arg InsertProjectEnvironmentParams) error
|
||||||
ListActiveBanners(ctx context.Context) ([]Banner, error)
|
ListActiveBanners(ctx context.Context) ([]Banner, error)
|
||||||
ListAgentAuthTokens(ctx context.Context) ([]AgentAuthToken, error)
|
ListAgentAuthTokens(ctx context.Context) ([]AgentAuthToken, error)
|
||||||
ListAgentHeartbeatsSince(ctx context.Context, arg ListAgentHeartbeatsSinceParams) ([]AgentHeartbeat, error)
|
ListAgentHeartbeatsSince(ctx context.Context, arg ListAgentHeartbeatsSinceParams) ([]AgentHeartbeat, error)
|
||||||
ListAgents(ctx context.Context) ([]NodeAgent, error)
|
ListAgents(ctx context.Context) ([]NodeAgent, error)
|
||||||
ListAllDatabaseServices(ctx context.Context) ([]DatabaseService, error)
|
ListAllDatabaseServices(ctx context.Context) ([]DatabaseService, error)
|
||||||
|
ListAllNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error)
|
||||||
ListBackupTargetsByUser(ctx context.Context, userID string) ([]BackupTarget, error)
|
ListBackupTargetsByUser(ctx context.Context, userID string) ([]BackupTarget, error)
|
||||||
ListBanners(ctx context.Context) ([]Banner, error)
|
ListBanners(ctx context.Context) ([]Banner, error)
|
||||||
ListCommandsForAgent(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
|
ListCommandsForAgent(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
|
||||||
@@ -90,6 +93,7 @@ type Querier interface {
|
|||||||
ListDatabaseServicesByUser(ctx context.Context, userID string) ([]DatabaseService, error)
|
ListDatabaseServicesByUser(ctx context.Context, userID string) ([]DatabaseService, error)
|
||||||
ListDueDatabaseBackups(ctx context.Context) ([]ListDueDatabaseBackupsRow, error)
|
ListDueDatabaseBackups(ctx context.Context) ([]ListDueDatabaseBackupsRow, error)
|
||||||
ListEnabledOutboundWebhooks(ctx context.Context) ([]OutboundWebhook, error)
|
ListEnabledOutboundWebhooks(ctx context.Context) ([]OutboundWebhook, error)
|
||||||
|
ListNotificationChannelsByUser(ctx context.Context, userID uuid.UUID) ([]NotificationChannel, error)
|
||||||
ListNotificationsByUser(ctx context.Context, arg ListNotificationsByUserParams) ([]Notification, error)
|
ListNotificationsByUser(ctx context.Context, arg ListNotificationsByUserParams) ([]Notification, error)
|
||||||
ListOutboundWebhooksByUser(ctx context.Context, userID uuid.UUID) ([]OutboundWebhook, error)
|
ListOutboundWebhooksByUser(ctx context.Context, userID uuid.UUID) ([]OutboundWebhook, error)
|
||||||
ListPendingCommands(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
|
ListPendingCommands(ctx context.Context, nodeAgentID string) ([]AgentCommand, error)
|
||||||
|
|||||||
@@ -145,6 +145,10 @@ func init() {
|
|||||||
// Notifications
|
// Notifications
|
||||||
register(spec{"containr_notifications_list", "List notifications", "GET", "/notifications", nil, nil, false})
|
register(spec{"containr_notifications_list", "List notifications", "GET", "/notifications", nil, nil, false})
|
||||||
register(spec{"containr_notifications_read", "Mark a notification read, or all notifications with id=all", "POST", "/notifications/{id}/read", []string{"id"}, nil, false})
|
register(spec{"containr_notifications_read", "Mark a notification read, or all notifications with id=all", "POST", "/notifications/{id}/read", []string{"id"}, nil, false})
|
||||||
|
register(spec{"containr_notification_channels_list", "List push notification channels (ntfy/Gotify)", "GET", "/notifications/channels", nil, nil, false})
|
||||||
|
register(spec{"containr_notification_channels_create", "Add a push notification channel. Args: kind (ntfy|gotify), endpoint (full URL incl. ntfy topic or Gotify base), token (ntfy access token or Gotify app token).", "POST", "/notifications/channels", nil, []string{"kind", "endpoint", "token"}, false})
|
||||||
|
register(spec{"containr_notification_channels_test", "Send a test notification through a push channel. Args: id.", "POST", "/notifications/channels/{id}/test", []string{"id"}, nil, false})
|
||||||
|
register(spec{"containr_notification_channels_delete", "Delete a push notification channel. Args: id. Requires confirm=true.", "DELETE", "/notifications/channels/{id}", []string{"id"}, nil, true})
|
||||||
|
|
||||||
register(spec{"containr_webhooks_list", "List outbound webhooks", "GET", "/webhooks", nil, nil, false})
|
register(spec{"containr_webhooks_list", "List outbound webhooks", "GET", "/webhooks", nil, nil, false})
|
||||||
register(spec{"containr_webhooks_create", "Create an outbound webhook. Args: name, url, events (list, e.g. [\"service.*\",\"*\"]), secret (auto-generated if omitted), headers, enabled.", "POST", "/webhooks", nil, []string{"name", "url", "events", "secret", "headers", "enabled"}, false})
|
register(spec{"containr_webhooks_create", "Create an outbound webhook. Args: name, url, events (list, e.g. [\"service.*\",\"*\"]), secret (auto-generated if omitted), headers, enabled.", "POST", "/webhooks", nil, []string{"name", "url", "events", "secret", "headers", "enabled"}, false})
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-- +goose Up
|
||||||
|
CREATE TABLE IF NOT EXISTS public.notification_channels (
|
||||||
|
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
user_id uuid NOT NULL REFERENCES public.users(id) ON DELETE CASCADE,
|
||||||
|
kind varchar(20) NOT NULL CHECK (kind IN ('ntfy', 'gotify')),
|
||||||
|
endpoint text NOT NULL,
|
||||||
|
token varchar(255),
|
||||||
|
enabled boolean NOT NULL DEFAULT true,
|
||||||
|
created_at timestamptz DEFAULT now(),
|
||||||
|
updated_at timestamptz DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_notification_channels_user ON public.notification_channels (user_id);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
DROP TABLE IF EXISTS public.notification_channels;
|
||||||
@@ -17,3 +17,23 @@ UPDATE notifications SET read_at = $3 WHERE id = $1 AND user_id = $2 AND read_at
|
|||||||
|
|
||||||
-- name: MarkAllNotificationsReadByUser :exec
|
-- name: MarkAllNotificationsReadByUser :exec
|
||||||
UPDATE notifications SET read_at = $2 WHERE user_id = $1 AND read_at IS NULL;
|
UPDATE notifications SET read_at = $2 WHERE user_id = $1 AND read_at IS NULL;
|
||||||
|
|
||||||
|
-- name: ListNotificationChannelsByUser :many
|
||||||
|
SELECT id, user_id, kind, endpoint, token, enabled, created_at, updated_at
|
||||||
|
FROM notification_channels
|
||||||
|
WHERE user_id = $1 AND enabled
|
||||||
|
ORDER BY created_at;
|
||||||
|
|
||||||
|
-- name: ListAllNotificationChannelsByUser :many
|
||||||
|
SELECT id, user_id, kind, endpoint, token, enabled, created_at, updated_at
|
||||||
|
FROM notification_channels
|
||||||
|
WHERE user_id = $1
|
||||||
|
ORDER BY created_at;
|
||||||
|
|
||||||
|
-- name: InsertNotificationChannel :one
|
||||||
|
INSERT INTO notification_channels (user_id, kind, endpoint, token)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
RETURNING id, user_id, kind, endpoint, token, enabled, created_at, updated_at;
|
||||||
|
|
||||||
|
-- name: DeleteNotificationChannel :execrows
|
||||||
|
DELETE FROM notification_channels WHERE id = $1 AND user_id = $2;
|
||||||
@@ -335,3 +335,14 @@ CREATE TABLE user_invites (
|
|||||||
used_at TIMESTAMP WITH TIME ZONE,
|
used_at TIMESTAMP WITH TIME ZONE,
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE TABLE notification_channels (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||||
|
kind VARCHAR(20) NOT NULL CHECK (kind IN ('ntfy', 'gotify')),
|
||||||
|
endpoint TEXT NOT NULL,
|
||||||
|
token VARCHAR(255),
|
||||||
|
enabled BOOLEAN NOT NULL DEFAULT TRUE,
|
||||||
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
||||||
|
);
|
||||||
Generated
+54
-8
@@ -31,7 +31,9 @@
|
|||||||
"@tabler/icons-react": "^3.37.1",
|
"@tabler/icons-react": "^3.37.1",
|
||||||
"@tailwindcss/postcss": "^4.1.18",
|
"@tailwindcss/postcss": "^4.1.18",
|
||||||
"@tailwindcss/typography": "^0.5.19",
|
"@tailwindcss/typography": "^0.5.19",
|
||||||
|
"@tanstack/query-sync-storage-persister": "^5.104.1",
|
||||||
"@tanstack/react-query": "^5.66.0",
|
"@tanstack/react-query": "^5.66.0",
|
||||||
|
"@tanstack/react-query-persist-client": "^5.104.1",
|
||||||
"@types/dompurify": "^3.0.5",
|
"@types/dompurify": "^3.0.5",
|
||||||
"@xterm/addon-fit": "^0.11.0",
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
"@xterm/xterm": "^6.0.0",
|
"@xterm/xterm": "^6.0.0",
|
||||||
@@ -3441,22 +3443,49 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tanstack/query-core": {
|
"node_modules/@tanstack/query-core": {
|
||||||
"version": "5.90.20",
|
"version": "5.104.1",
|
||||||
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.20.tgz",
|
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.104.1.tgz",
|
||||||
"integrity": "sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==",
|
"integrity": "sha512-TiRghcrGkUTE+M4JBxvpPSpBhxvIzQairw+cksrHYGr+2uwC77yW1SY9nYxnYRYOppvucf8rEg6b5byoz4rTpw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "github",
|
"type": "github",
|
||||||
"url": "https://github.com/sponsors/tannerlinsley"
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tanstack/react-query": {
|
"node_modules/@tanstack/query-persist-client-core": {
|
||||||
"version": "5.90.21",
|
"version": "5.104.1",
|
||||||
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.21.tgz",
|
"resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.104.1.tgz",
|
||||||
"integrity": "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==",
|
"integrity": "sha512-ONiadXqe56iNrw6RESqKILpTIVG9ZMI/DageTQnrBDt/nZ6WiP4G13iIiMwJEsiO12gQ3Gychx8tcFIPw4k25g==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tanstack/query-core": "5.90.20"
|
"@tanstack/query-core": "5.104.1"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tanstack/query-sync-storage-persister": {
|
||||||
|
"version": "5.104.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-5.104.1.tgz",
|
||||||
|
"integrity": "sha512-eDsBMNds48+sjXILn0dQKu+uYwfh9tGIB+Rb0cKRdoxD22HHBMzJes5DJOhJVLUhBQbxtoFq+Hpha/Vohh14NQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tanstack/query-core": "5.104.1",
|
||||||
|
"@tanstack/query-persist-client-core": "5.104.1"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tanstack/react-query": {
|
||||||
|
"version": "5.104.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.104.1.tgz",
|
||||||
|
"integrity": "sha512-Zz70EgjahNI7aCz8BZxM3vUGU44ycxEAzMuCUjLeA7SVhhOkg3ZgPjPJPvHjs6Rmky/dtmnu1WzjGHNHmhCoZQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tanstack/query-core": "5.104.1"
|
||||||
},
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "github",
|
"type": "github",
|
||||||
@@ -3466,6 +3495,23 @@
|
|||||||
"react": "^18 || ^19"
|
"react": "^18 || ^19"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@tanstack/react-query-persist-client": {
|
||||||
|
"version": "5.104.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-5.104.1.tgz",
|
||||||
|
"integrity": "sha512-kU3YaqjkwEUzUUfPF0JVg56d6gJKWHaFVqOlQztwc4C2IT0P5sv/23orrSoQqjxKaUe6Ejw5IIQtA/G12uNmow==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tanstack/query-persist-client-core": "5.104.1"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@tanstack/react-query": "^5.104.1",
|
||||||
|
"react": "^18 || ^19"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@testing-library/dom": {
|
"node_modules/@testing-library/dom": {
|
||||||
"version": "10.4.1",
|
"version": "10.4.1",
|
||||||
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
|
||||||
|
|||||||
@@ -42,7 +42,9 @@
|
|||||||
"@tabler/icons-react": "^3.37.1",
|
"@tabler/icons-react": "^3.37.1",
|
||||||
"@tailwindcss/postcss": "^4.1.18",
|
"@tailwindcss/postcss": "^4.1.18",
|
||||||
"@tailwindcss/typography": "^0.5.19",
|
"@tailwindcss/typography": "^0.5.19",
|
||||||
|
"@tanstack/query-sync-storage-persister": "^5.104.1",
|
||||||
"@tanstack/react-query": "^5.66.0",
|
"@tanstack/react-query": "^5.66.0",
|
||||||
|
"@tanstack/react-query-persist-client": "^5.104.1",
|
||||||
"@types/dompurify": "^3.0.5",
|
"@types/dompurify": "^3.0.5",
|
||||||
"@xterm/addon-fit": "^0.11.0",
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
"@xterm/xterm": "^6.0.0",
|
"@xterm/xterm": "^6.0.0",
|
||||||
|
|||||||
@@ -30,10 +30,12 @@ import {
|
|||||||
User,
|
User,
|
||||||
Users,
|
Users,
|
||||||
Webhook,
|
Webhook,
|
||||||
|
WifiOff,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
getCurrentUserProfile,
|
getCurrentUserProfile,
|
||||||
getUpgradeStatus,
|
getUpgradeStatus,
|
||||||
|
pingServer,
|
||||||
listNotifications,
|
listNotifications,
|
||||||
markAllNotificationsRead,
|
markAllNotificationsRead,
|
||||||
markNotificationRead,
|
markNotificationRead,
|
||||||
@@ -105,6 +107,42 @@ function getInitialSidebar(): boolean {
|
|||||||
return readStorage('containr.sidebar.expanded') !== '0';
|
return readStorage('containr.sidebar.expanded') !== '0';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ConnectivityBanner pings /health every 15s and listens for browser
|
||||||
|
// online/offline events — when the instance is unreachable it shows a
|
||||||
|
// slim bar so the persisted last-known data doesn't masquerade as live.
|
||||||
|
function ConnectivityBanner() {
|
||||||
|
const [offline, setOffline] = useState(() => !navigator.onLine);
|
||||||
|
useEffect(() => {
|
||||||
|
const up = () => setOffline(false);
|
||||||
|
const down = () => setOffline(true);
|
||||||
|
window.addEventListener('online', up);
|
||||||
|
window.addEventListener('offline', down);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('online', up);
|
||||||
|
window.removeEventListener('offline', down);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
const ping = useQuery({
|
||||||
|
queryKey: ['connectivity'],
|
||||||
|
queryFn: pingServer,
|
||||||
|
refetchInterval: 15_000,
|
||||||
|
retry: 0,
|
||||||
|
networkMode: 'always',
|
||||||
|
staleTime: 0,
|
||||||
|
});
|
||||||
|
if (!offline && !ping.isError) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div className="flex items-center justify-center gap-2 border-b border-[var(--warning,var(--border-subtle))] bg-[var(--surface-muted)] px-4 py-1.5 text-xs text-[var(--text-secondary)]">
|
||||||
|
<WifiOff size={13} className="text-[var(--warning,#f59e0b)]" />
|
||||||
|
{offline
|
||||||
|
? 'No network connection — showing last-known data.'
|
||||||
|
: 'Cannot reach this Containr instance — showing last-known data. Retrying…'}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function PlatformShell() {
|
export function PlatformShell() {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@@ -557,6 +595,7 @@ export function PlatformShell() {
|
|||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
<ConnectivityBanner />
|
||||||
<main className="flex-1 overflow-y-auto">
|
<main className="flex-1 overflow-y-auto">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -75,6 +75,11 @@ import {
|
|||||||
type CreateDatabaseInput,
|
type CreateDatabaseInput,
|
||||||
type DatabaseEntity,
|
type DatabaseEntity,
|
||||||
type FailoverPolicy,
|
type FailoverPolicy,
|
||||||
|
listNotificationChannels,
|
||||||
|
createNotificationChannel,
|
||||||
|
deleteNotificationChannel,
|
||||||
|
testNotificationChannel,
|
||||||
|
type NotificationChannel,
|
||||||
} from '@/lib/api-client';
|
} from '@/lib/api-client';
|
||||||
import {
|
import {
|
||||||
demoBuilds,
|
demoBuilds,
|
||||||
@@ -139,6 +144,8 @@ import {
|
|||||||
Cloud,
|
Cloud,
|
||||||
ExternalLink,
|
ExternalLink,
|
||||||
Upload,
|
Upload,
|
||||||
|
Bell,
|
||||||
|
Send,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
|
|
||||||
function SecondaryPageHeader({ title, description }: { title: string; description: string }) {
|
function SecondaryPageHeader({ title, description }: { title: string; description: string }) {
|
||||||
@@ -1908,6 +1915,151 @@ function BackupTargetsSection() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function NotificationChannelsSection() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
const channelsQuery = useQuery({
|
||||||
|
queryKey: ['notification-channels'],
|
||||||
|
queryFn: listNotificationChannels,
|
||||||
|
});
|
||||||
|
const [kind, setKind] = useState<'ntfy' | 'gotify'>('ntfy');
|
||||||
|
const [endpoint, setEndpoint] = useState('');
|
||||||
|
const [token, setToken] = useState('');
|
||||||
|
const [testResult, setTestResult] = useState<Record<string, 'ok' | string>>({});
|
||||||
|
|
||||||
|
const invalidate = () => queryClient.invalidateQueries({ queryKey: ['notification-channels'] });
|
||||||
|
const createMutation = useMutation({
|
||||||
|
mutationFn: () =>
|
||||||
|
createNotificationChannel({
|
||||||
|
kind,
|
||||||
|
endpoint: endpoint.trim(),
|
||||||
|
token: token.trim() || undefined,
|
||||||
|
}),
|
||||||
|
onSuccess: () => {
|
||||||
|
setEndpoint('');
|
||||||
|
setToken('');
|
||||||
|
invalidate();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const deleteMutation = useMutation({
|
||||||
|
mutationFn: (id: string) => deleteNotificationChannel(id),
|
||||||
|
onSuccess: invalidate,
|
||||||
|
});
|
||||||
|
const testMutation = useMutation({
|
||||||
|
mutationFn: (id: string) => testNotificationChannel(id),
|
||||||
|
onSuccess: (_d, id) => setTestResult((prev) => ({ ...prev, [id]: 'ok' })),
|
||||||
|
onError: (err, id) =>
|
||||||
|
setTestResult((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[id]: err instanceof Error ? err.message : 'delivery failed',
|
||||||
|
})),
|
||||||
|
});
|
||||||
|
|
||||||
|
const channels = channelsQuery.data ?? [];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="panel p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="w-10 h-10 rounded-[var(--radius-md)] bg-[var(--accent-primary-soft)] flex items-center justify-center">
|
||||||
|
<Bell size={18} className="text-[var(--accent-primary)]" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h2 className="text-lg font-semibold text-[var(--text-primary)]">Push notifications</h2>
|
||||||
|
<p className="text-xs text-[var(--text-tertiary)]">Relay notifications to a self-hosted ntfy or Gotify server</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex flex-wrap gap-2">
|
||||||
|
<select
|
||||||
|
value={kind}
|
||||||
|
onChange={(e) => setKind(e.target.value as 'ntfy' | 'gotify')}
|
||||||
|
className="h-9 rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] px-3 text-sm text-[var(--text-primary)] focus:border-[var(--accent-primary)] transition-all"
|
||||||
|
>
|
||||||
|
<option value="ntfy">ntfy</option>
|
||||||
|
<option value="gotify">Gotify</option>
|
||||||
|
</select>
|
||||||
|
<input
|
||||||
|
value={endpoint}
|
||||||
|
onChange={(e) => setEndpoint(e.target.value)}
|
||||||
|
placeholder={kind === 'ntfy' ? 'https://ntfy.example.com/my-alerts' : 'https://gotify.example.com'}
|
||||||
|
className="h-9 flex-1 min-w-[220px] rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] px-3 text-sm text-[var(--text-primary)] placeholder:text-[var(--text-muted)] focus:border-[var(--accent-primary)] transition-all"
|
||||||
|
/>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
value={token}
|
||||||
|
onChange={(e) => setToken(e.target.value)}
|
||||||
|
placeholder={kind === 'ntfy' ? 'Access token (optional)' : 'App token'}
|
||||||
|
className="h-9 w-48 rounded-[var(--radius-md)] border border-[var(--border-subtle)] bg-[var(--surface-muted)] px-3 text-sm text-[var(--text-primary)] placeholder:text-[var(--text-muted)] focus:border-[var(--accent-primary)] transition-all"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
onClick={() => createMutation.mutate()}
|
||||||
|
disabled={createMutation.isPending || !endpoint.trim()}
|
||||||
|
className="h-9 px-4 rounded-[var(--radius-md)] text-sm font-medium text-[var(--accent-on)] disabled:opacity-50 disabled:cursor-not-allowed transition-all"
|
||||||
|
style={{ background: 'var(--accent-primary)' }}
|
||||||
|
>
|
||||||
|
{createMutation.isPending ? 'Adding…' : 'Add channel'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{createMutation.isError ? (
|
||||||
|
<p className="text-xs text-[var(--error)]">
|
||||||
|
{createMutation.error instanceof Error ? createMutation.error.message : 'Failed to add channel'}
|
||||||
|
</p>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{channelsQuery.isLoading ? (
|
||||||
|
<div className="py-4 text-center">
|
||||||
|
<Loader2 size={16} className="animate-spin mx-auto text-[var(--text-tertiary)]" />
|
||||||
|
</div>
|
||||||
|
) : channels.length === 0 ? (
|
||||||
|
<p className="text-xs text-[var(--text-tertiary)]">
|
||||||
|
No push channels. Notifications stay in-app until you add one.
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-1.5 border-t border-[var(--border-subtle)] pt-3">
|
||||||
|
{channels.map((ch: NotificationChannel) => (
|
||||||
|
<div key={ch.id} className="flex items-center justify-between gap-2 text-xs">
|
||||||
|
<div className="min-w-0">
|
||||||
|
<span className="rounded px-1.5 py-0.5 bg-[var(--surface-muted)] text-[var(--text-secondary)] uppercase">
|
||||||
|
{ch.kind}
|
||||||
|
</span>
|
||||||
|
<span className="ml-2 mono text-[var(--text-primary)] break-all">{ch.endpoint}</span>
|
||||||
|
{testResult[ch.id] === 'ok' ? (
|
||||||
|
<span className="ml-2 text-[var(--success)]">delivered</span>
|
||||||
|
) : testResult[ch.id] ? (
|
||||||
|
<span className="ml-2 text-[var(--error)]">{testResult[ch.id]}</span>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-3 shrink-0">
|
||||||
|
<button
|
||||||
|
onClick={() => testMutation.mutate(ch.id)}
|
||||||
|
disabled={testMutation.isPending}
|
||||||
|
className="flex items-center gap-1 text-[var(--text-secondary)] hover:text-[var(--accent-primary)] disabled:opacity-50"
|
||||||
|
>
|
||||||
|
<Send size={12} />
|
||||||
|
Test
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => {
|
||||||
|
if (window.confirm(`Remove ${ch.kind} channel ${ch.endpoint}?`)) {
|
||||||
|
deleteMutation.mutate(ch.id);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
disabled={deleteMutation.isPending}
|
||||||
|
className="text-[var(--error)] hover:underline disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Remove
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function SettingsPage() {
|
export function SettingsPage() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@@ -2081,6 +2233,7 @@ export function SettingsPage() {
|
|||||||
|
|
||||||
{/* Personal Access Tokens */}
|
{/* Personal Access Tokens */}
|
||||||
<UserTokensSection isAdmin={profileQuery.data?.isAdmin ?? false} />
|
<UserTokensSection isAdmin={profileQuery.data?.isAdmin ?? false} />
|
||||||
|
<NotificationChannelsSection />
|
||||||
<RegistriesSection />
|
<RegistriesSection />
|
||||||
<BackupTargetsSection />
|
<BackupTargetsSection />
|
||||||
|
|
||||||
|
|||||||
@@ -3698,6 +3698,167 @@ export interface paths {
|
|||||||
patch?: never;
|
patch?: never;
|
||||||
trace?: never;
|
trace?: never;
|
||||||
};
|
};
|
||||||
|
"/notifications/channels": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
/** List push notification channels (ntfy/Gotify) */
|
||||||
|
get: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Channel list */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": {
|
||||||
|
channels?: components["schemas"]["NotificationChannel"][];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
put?: never;
|
||||||
|
/**
|
||||||
|
* Add a push notification channel
|
||||||
|
* @description ntfy endpoint should include the topic (e.g. https://ntfy.example.com/my-alerts); Gotify endpoint is the server base URL with the app token in `token`.
|
||||||
|
*/
|
||||||
|
post: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody: {
|
||||||
|
content: {
|
||||||
|
"application/json": {
|
||||||
|
/** @enum {string} */
|
||||||
|
kind: "ntfy" | "gotify";
|
||||||
|
/** Format: uri */
|
||||||
|
endpoint: string;
|
||||||
|
/** @description ntfy access token (Bearer) or Gotify app token */
|
||||||
|
token?: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
responses: {
|
||||||
|
/** @description Channel created */
|
||||||
|
201: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": {
|
||||||
|
channel?: components["schemas"]["NotificationChannel"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
400: components["schemas"]["Error"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
|
"/notifications/channels/{id}": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
post?: never;
|
||||||
|
/** Delete a push notification channel */
|
||||||
|
delete: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Deleted */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["MessageResponse"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
404: components["schemas"]["Error"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
|
"/notifications/channels/{id}/test": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
/** Send a test notification through a push channel */
|
||||||
|
post: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Test delivered */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["MessageResponse"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Push delivery failed */
|
||||||
|
502: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["Error"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
"/webhooks": {
|
"/webhooks": {
|
||||||
parameters: {
|
parameters: {
|
||||||
query?: never;
|
query?: never;
|
||||||
@@ -11824,6 +11985,17 @@ export interface components {
|
|||||||
notifications?: components["schemas"]["Notification"][];
|
notifications?: components["schemas"]["Notification"][];
|
||||||
unread?: number;
|
unread?: number;
|
||||||
};
|
};
|
||||||
|
NotificationChannel: {
|
||||||
|
/** Format: uuid */
|
||||||
|
id?: string;
|
||||||
|
/** @enum {string} */
|
||||||
|
kind?: "ntfy" | "gotify";
|
||||||
|
/** Format: uri */
|
||||||
|
endpoint?: string;
|
||||||
|
enabled?: boolean;
|
||||||
|
/** Format: date-time */
|
||||||
|
created_at?: string;
|
||||||
|
};
|
||||||
OutboundWebhook: {
|
OutboundWebhook: {
|
||||||
/** Format: uuid */
|
/** Format: uuid */
|
||||||
id?: string;
|
id?: string;
|
||||||
|
|||||||
@@ -490,6 +490,15 @@ export function getApiBaseUrl(): string {
|
|||||||
return API_BASE;
|
return API_BASE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// pingServer hits the public /health route — any HTTP response proves
|
||||||
|
// reachability, and no auth means no 401 noise in the connectivity probe.
|
||||||
|
export async function pingServer(): Promise<void> {
|
||||||
|
const res = await fetch(`${API_ROOT}/health`);
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new Error(`Server returned ${res.status}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function getAgentPublicBaseUrl(): string {
|
export function getAgentPublicBaseUrl(): string {
|
||||||
return `${API_ROOT}/api/agents`;
|
return `${API_ROOT}/api/agents`;
|
||||||
}
|
}
|
||||||
@@ -2596,6 +2605,42 @@ export async function markAllNotificationsRead(): Promise<void> {
|
|||||||
await requestJson('/notifications/read-all', { method: 'POST' });
|
await requestJson('/notifications/read-all', { method: 'POST' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type NotificationChannel = {
|
||||||
|
id: string;
|
||||||
|
kind: 'ntfy' | 'gotify';
|
||||||
|
endpoint: string;
|
||||||
|
enabled: boolean;
|
||||||
|
created_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function listNotificationChannels(): Promise<NotificationChannel[]> {
|
||||||
|
const payload = await requestJson<{ channels?: NotificationChannel[] }>('/notifications/channels');
|
||||||
|
return payload.channels ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createNotificationChannel(input: {
|
||||||
|
kind: 'ntfy' | 'gotify';
|
||||||
|
endpoint: string;
|
||||||
|
token?: string;
|
||||||
|
}): Promise<NotificationChannel> {
|
||||||
|
const payload = await requestJson<{ channel: NotificationChannel }>('/notifications/channels', {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify(input),
|
||||||
|
});
|
||||||
|
return payload.channel;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteNotificationChannel(id: string): Promise<void> {
|
||||||
|
await requestJson(`/notifications/channels/${encodeURIComponent(id)}`, { method: 'DELETE' });
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function testNotificationChannel(id: string): Promise<void> {
|
||||||
|
await requestJson(`/notifications/channels/${encodeURIComponent(id)}/test`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export type PreviewEnvironmentEntity = components['schemas']['PreviewEnvironment'];
|
export type PreviewEnvironmentEntity = components['schemas']['PreviewEnvironment'];
|
||||||
|
|
||||||
export async function listPreviewEnvironments(projectId: string): Promise<PreviewEnvironmentEntity[]> {
|
export async function listPreviewEnvironments(projectId: string): Promise<PreviewEnvironmentEntity[]> {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import { StrictMode } from 'react';
|
import { StrictMode } from 'react';
|
||||||
import { createRoot } from 'react-dom/client';
|
import { createRoot } from 'react-dom/client';
|
||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
import { QueryClient } from '@tanstack/react-query';
|
||||||
|
import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
|
||||||
|
import { createSyncStoragePersister } from '@tanstack/query-sync-storage-persister';
|
||||||
import { BrowserRouter } from 'react-router-dom';
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
import App from './app/App';
|
import App from './app/App';
|
||||||
import { ToastProvider } from './shared/components';
|
import { ToastProvider } from './shared/components';
|
||||||
@@ -12,18 +14,49 @@ const queryClient = new QueryClient({
|
|||||||
staleTime: 30_000,
|
staleTime: 30_000,
|
||||||
retry: 1,
|
retry: 1,
|
||||||
refetchOnWindowFocus: false,
|
refetchOnWindowFocus: false,
|
||||||
|
// Serve the persisted snapshot while offline instead of erroring.
|
||||||
|
networkMode: 'offlineFirst',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// High-churn or bulky keys never hit localStorage — a stale log tail is
|
||||||
|
// worse than none.
|
||||||
|
const NEVER_PERSIST = new Set([
|
||||||
|
'shell-notifications',
|
||||||
|
'notifications',
|
||||||
|
'service-logs',
|
||||||
|
'logs',
|
||||||
|
'activity',
|
||||||
|
'audit-logs',
|
||||||
|
'audit',
|
||||||
|
'metrics',
|
||||||
|
'connectivity',
|
||||||
|
]);
|
||||||
|
|
||||||
|
const persister = createSyncStoragePersister({
|
||||||
|
storage: window.localStorage,
|
||||||
|
key: 'containr-query-cache-v1',
|
||||||
|
});
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
createRoot(document.getElementById('root')!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<QueryClientProvider client={queryClient}>
|
<PersistQueryClientProvider
|
||||||
|
client={queryClient}
|
||||||
|
persistOptions={{
|
||||||
|
persister,
|
||||||
|
maxAge: 24 * 60 * 60 * 1000,
|
||||||
|
dehydrateOptions: {
|
||||||
|
shouldDehydrateQuery: (q) =>
|
||||||
|
q.state.status === 'success' && !NEVER_PERSIST.has(String(q.queryKey[0])),
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<ToastProvider>
|
<ToastProvider>
|
||||||
<App />
|
<App />
|
||||||
</ToastProvider>
|
</ToastProvider>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</QueryClientProvider>
|
</PersistQueryClientProvider>
|
||||||
</StrictMode>,
|
</StrictMode>,
|
||||||
);
|
);
|
||||||
Generated
+91
@@ -9,11 +9,15 @@
|
|||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/vector-icons": "^15.0.2",
|
"@expo/vector-icons": "^15.0.2",
|
||||||
|
"@react-native-async-storage/async-storage": "2.2.0",
|
||||||
|
"@tanstack/query-async-storage-persister": "^5.104.1",
|
||||||
"@tanstack/react-query": "^5.104.1",
|
"@tanstack/react-query": "^5.104.1",
|
||||||
|
"@tanstack/react-query-persist-client": "^5.104.1",
|
||||||
"expo": "~57.0.27",
|
"expo": "~57.0.27",
|
||||||
"expo-constants": "~57.0.21",
|
"expo-constants": "~57.0.21",
|
||||||
"expo-font": "~57.0.4",
|
"expo-font": "~57.0.4",
|
||||||
"expo-linking": "~57.0.12",
|
"expo-linking": "~57.0.12",
|
||||||
|
"expo-network": "~57.0.2",
|
||||||
"expo-router": "~57.0.25",
|
"expo-router": "~57.0.25",
|
||||||
"expo-secure-store": "~57.0.4",
|
"expo-secure-store": "~57.0.4",
|
||||||
"expo-status-bar": "~57.0.1",
|
"expo-status-bar": "~57.0.1",
|
||||||
@@ -2165,6 +2169,18 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@react-native-async-storage/async-storage": {
|
||||||
|
"version": "2.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-2.2.0.tgz",
|
||||||
|
"integrity": "sha512-gvRvjR5JAaUZF8tv2Kcq/Gbt3JHwbKFYfmb445rhOj6NUMx3qPLixmDx5pZAyb9at1bYvJ4/eTUipU5aki45xw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"merge-options": "^3.0.4"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react-native": "^0.0.0-0 || >=0.65 <1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@react-native-masked-view/masked-view": {
|
"node_modules/@react-native-masked-view/masked-view": {
|
||||||
"version": "0.3.2",
|
"version": "0.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.3.2.tgz",
|
||||||
@@ -2469,6 +2485,20 @@
|
|||||||
"integrity": "sha512-hhyNJ+nbR6ZR7pToHvllEFun9TL0sbL+tk/ON75lo+Xas054uez98qRbsuNt7MBCyZKK4+8Yli/OAGZhmfBZ/g==",
|
"integrity": "sha512-hhyNJ+nbR6ZR7pToHvllEFun9TL0sbL+tk/ON75lo+Xas054uez98qRbsuNt7MBCyZKK4+8Yli/OAGZhmfBZ/g==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/@tanstack/query-async-storage-persister": {
|
||||||
|
"version": "5.104.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tanstack/query-async-storage-persister/-/query-async-storage-persister-5.104.1.tgz",
|
||||||
|
"integrity": "sha512-wSs/HrangoSMVW3zLifawRT9lA+fbiilPQmaY+YhxBOM/VS9oqx+MQvROHpW+hKwDpdvFmhyBjWiyDhTHL1YXg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tanstack/query-core": "5.104.1",
|
||||||
|
"@tanstack/query-persist-client-core": "5.104.1"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@tanstack/query-core": {
|
"node_modules/@tanstack/query-core": {
|
||||||
"version": "5.104.1",
|
"version": "5.104.1",
|
||||||
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.104.1.tgz",
|
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.104.1.tgz",
|
||||||
@@ -2479,6 +2509,19 @@
|
|||||||
"url": "https://github.com/sponsors/tannerlinsley"
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@tanstack/query-persist-client-core": {
|
||||||
|
"version": "5.104.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.104.1.tgz",
|
||||||
|
"integrity": "sha512-ONiadXqe56iNrw6RESqKILpTIVG9ZMI/DageTQnrBDt/nZ6WiP4G13iIiMwJEsiO12gQ3Gychx8tcFIPw4k25g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tanstack/query-core": "5.104.1"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@tanstack/react-query": {
|
"node_modules/@tanstack/react-query": {
|
||||||
"version": "5.104.1",
|
"version": "5.104.1",
|
||||||
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.104.1.tgz",
|
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.104.1.tgz",
|
||||||
@@ -2495,6 +2538,23 @@
|
|||||||
"react": "^18 || ^19"
|
"react": "^18 || ^19"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@tanstack/react-query-persist-client": {
|
||||||
|
"version": "5.104.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tanstack/react-query-persist-client/-/react-query-persist-client-5.104.1.tgz",
|
||||||
|
"integrity": "sha512-kU3YaqjkwEUzUUfPF0JVg56d6gJKWHaFVqOlQztwc4C2IT0P5sv/23orrSoQqjxKaUe6Ejw5IIQtA/G12uNmow==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@tanstack/query-persist-client-core": "5.104.1"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/tannerlinsley"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@tanstack/react-query": "^5.104.1",
|
||||||
|
"react": "^18 || ^19"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@tybys/wasm-util": {
|
"node_modules/@tybys/wasm-util": {
|
||||||
"version": "0.10.4",
|
"version": "0.10.4",
|
||||||
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz",
|
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz",
|
||||||
@@ -5416,6 +5476,16 @@
|
|||||||
"react-native": "*"
|
"react-native": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/expo-network": {
|
||||||
|
"version": "57.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/expo-network/-/expo-network-57.0.2.tgz",
|
||||||
|
"integrity": "sha512-BfK1kdftZcM6o9o1FAG7/y0l6vWX0n8td0M5lwkvaMeRXZ9LkRwOi9CQXwvsMTQGQiPwtQXgwiAze13cqjt75g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"peerDependencies": {
|
||||||
|
"expo": "*",
|
||||||
|
"react": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/expo-router": {
|
"node_modules/expo-router": {
|
||||||
"version": "57.0.25",
|
"version": "57.0.25",
|
||||||
"resolved": "https://registry.npmjs.org/expo-router/-/expo-router-57.0.25.tgz",
|
"resolved": "https://registry.npmjs.org/expo-router/-/expo-router-57.0.25.tgz",
|
||||||
@@ -7084,6 +7154,15 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/is-plain-obj": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/is-regex": {
|
"node_modules/is-regex": {
|
||||||
"version": "1.2.1",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
|
||||||
@@ -7968,6 +8047,18 @@
|
|||||||
"integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
|
"integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/merge-options": {
|
||||||
|
"version": "3.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz",
|
||||||
|
"integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"is-plain-obj": "^2.1.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/merge-stream": {
|
"node_modules/merge-stream": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
|
||||||
|
|||||||
@@ -4,11 +4,15 @@
|
|||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/vector-icons": "^15.0.2",
|
"@expo/vector-icons": "^15.0.2",
|
||||||
|
"@react-native-async-storage/async-storage": "2.2.0",
|
||||||
|
"@tanstack/query-async-storage-persister": "^5.104.1",
|
||||||
"@tanstack/react-query": "^5.104.1",
|
"@tanstack/react-query": "^5.104.1",
|
||||||
|
"@tanstack/react-query-persist-client": "^5.104.1",
|
||||||
"expo": "~57.0.27",
|
"expo": "~57.0.27",
|
||||||
"expo-constants": "~57.0.21",
|
"expo-constants": "~57.0.21",
|
||||||
"expo-font": "~57.0.4",
|
"expo-font": "~57.0.4",
|
||||||
"expo-linking": "~57.0.12",
|
"expo-linking": "~57.0.12",
|
||||||
|
"expo-network": "~57.0.2",
|
||||||
"expo-router": "~57.0.25",
|
"expo-router": "~57.0.25",
|
||||||
"expo-secure-store": "~57.0.4",
|
"expo-secure-store": "~57.0.4",
|
||||||
"expo-status-bar": "~57.0.1",
|
"expo-status-bar": "~57.0.1",
|
||||||
|
|||||||
@@ -94,6 +94,38 @@ export interface AppNotification {
|
|||||||
created_at?: string;
|
created_at?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface NotificationChannel {
|
||||||
|
id: string;
|
||||||
|
kind: 'ntfy' | 'gotify';
|
||||||
|
endpoint: string;
|
||||||
|
enabled: boolean;
|
||||||
|
created_at?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CronJob {
|
||||||
|
id: string;
|
||||||
|
service_id?: string;
|
||||||
|
name: string;
|
||||||
|
schedule: string;
|
||||||
|
command: string;
|
||||||
|
timezone?: string;
|
||||||
|
enabled?: boolean;
|
||||||
|
last_run_at?: string;
|
||||||
|
next_run_at?: string;
|
||||||
|
last_status?: string;
|
||||||
|
last_output?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CronExecution {
|
||||||
|
id: string;
|
||||||
|
cron_job_id: string;
|
||||||
|
started_at?: string;
|
||||||
|
finished_at?: string;
|
||||||
|
status?: string;
|
||||||
|
output?: string;
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
|
|
||||||
// Masked value the API returns for secret variables; echoing it back on
|
// Masked value the API returns for secret variables; echoing it back on
|
||||||
// update preserves the stored ciphertext.
|
// update preserves the stored ciphertext.
|
||||||
export const MASKED_SECRET = '********';
|
export const MASKED_SECRET = '********';
|
||||||
@@ -238,6 +270,51 @@ export class Api {
|
|||||||
return this.req<unknown>('POST', '/notifications/read-all');
|
return this.req<unknown>('POST', '/notifications/read-all');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
notificationChannels() {
|
||||||
|
return this.req<{ channels: NotificationChannel[] }>(
|
||||||
|
'GET',
|
||||||
|
'/notifications/channels',
|
||||||
|
).then((r) => r.channels ?? []);
|
||||||
|
}
|
||||||
|
|
||||||
|
addNotificationChannel(input: {
|
||||||
|
kind: 'ntfy' | 'gotify';
|
||||||
|
endpoint: string;
|
||||||
|
token?: string;
|
||||||
|
}) {
|
||||||
|
return this.req<{ channel: NotificationChannel }>(
|
||||||
|
'POST',
|
||||||
|
'/notifications/channels',
|
||||||
|
input,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteNotificationChannel(id: string) {
|
||||||
|
return this.req<unknown>('DELETE', `/notifications/channels/${id}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
testNotificationChannel(id: string) {
|
||||||
|
return this.req<unknown>('POST', `/notifications/channels/${id}/test`, {});
|
||||||
|
}
|
||||||
|
|
||||||
|
cronJobs(serviceId: string) {
|
||||||
|
return this.req<{ cron_jobs: CronJob[] }>(
|
||||||
|
'GET',
|
||||||
|
`/cron-jobs?service_id=${serviceId}`,
|
||||||
|
).then((r) => r.cron_jobs ?? []);
|
||||||
|
}
|
||||||
|
|
||||||
|
cronExecutions(jobId: string) {
|
||||||
|
return this.req<{ executions: CronExecution[] }>(
|
||||||
|
'GET',
|
||||||
|
`/cron-jobs/${jobId}/executions`,
|
||||||
|
).then((r) => r.executions ?? []);
|
||||||
|
}
|
||||||
|
|
||||||
|
triggerCronJob(jobId: string) {
|
||||||
|
return this.req<unknown>('POST', `/cron-jobs/${jobId}/trigger`, {});
|
||||||
|
}
|
||||||
|
|
||||||
serviceDeployments(id: string) {
|
serviceDeployments(id: string) {
|
||||||
return this.req<{ deployments: Deployment[] }>(
|
return this.req<{ deployments: Deployment[] }>(
|
||||||
'GET',
|
'GET',
|
||||||
|
|||||||
@@ -1,10 +1,39 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { StyleSheet, Text, View } from 'react-native';
|
||||||
import { Tabs } from 'expo-router';
|
import { Tabs } from 'expo-router';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
|
import * as Network from 'expo-network';
|
||||||
import { useApi } from '../../session';
|
import { useApi } from '../../session';
|
||||||
import { colors } from '../../theme';
|
import { colors } from '../../theme';
|
||||||
|
|
||||||
|
// OfflineBanner pings /health every 15s; expo-network gives a fast local
|
||||||
|
// signal, the ping catches "device online but instance down".
|
||||||
|
function OfflineBanner() {
|
||||||
|
const api = useApi();
|
||||||
|
const net = useQuery({
|
||||||
|
queryKey: ['connectivity', 'net'],
|
||||||
|
queryFn: async () => (await Network.getNetworkStateAsync()).isConnected !== false,
|
||||||
|
refetchInterval: 15_000,
|
||||||
|
});
|
||||||
|
const ping = useQuery({
|
||||||
|
queryKey: ['connectivity', 'ping'],
|
||||||
|
queryFn: () => api.ping(),
|
||||||
|
refetchInterval: 15_000,
|
||||||
|
retry: 0,
|
||||||
|
networkMode: 'always',
|
||||||
|
});
|
||||||
|
if (net.data !== false && ping.data !== false && !ping.isError) return null;
|
||||||
|
return (
|
||||||
|
<View style={styles.banner}>
|
||||||
|
<Ionicons name="cloud-offline-outline" size={13} color={colors.warn} />
|
||||||
|
<Text style={styles.bannerText}>
|
||||||
|
{net.data === false ? 'No connection' : 'Instance unreachable'} — showing last-known data
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default function TabsLayout() {
|
export default function TabsLayout() {
|
||||||
const api = useApi();
|
const api = useApi();
|
||||||
const notifs = useQuery({
|
const notifs = useQuery({
|
||||||
@@ -15,6 +44,8 @@ export default function TabsLayout() {
|
|||||||
const unread = notifs.data?.unread ?? 0;
|
const unread = notifs.data?.unread ?? 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<View style={{ flex: 1 }}>
|
||||||
|
<OfflineBanner />
|
||||||
<Tabs
|
<Tabs
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
headerStyle: { backgroundColor: colors.bg },
|
headerStyle: { backgroundColor: colors.bg },
|
||||||
@@ -71,5 +102,20 @@ export default function TabsLayout() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
</View>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
banner: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
gap: 6,
|
||||||
|
paddingVertical: 6,
|
||||||
|
backgroundColor: colors.surface,
|
||||||
|
borderBottomWidth: 1,
|
||||||
|
borderBottomColor: colors.warn,
|
||||||
|
},
|
||||||
|
bannerText: { color: colors.textDim, fontSize: 11 },
|
||||||
|
});
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import React from 'react';
|
import React, { useState } from 'react';
|
||||||
import { FlatList, RefreshControl, StyleSheet, Text, View } from 'react-native';
|
import { FlatList, RefreshControl, StyleSheet, Text, TextInput, View } from 'react-native';
|
||||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||||
import { useApi } from '../../session';
|
import { useApi } from '../../session';
|
||||||
import { colors } from '../../theme';
|
import { colors } from '../../theme';
|
||||||
import { relTime } from '../../time';
|
import { relTime } from '../../time';
|
||||||
import { ActionButton, Card, Empty, ErrorBox, Loading } from '../../components';
|
import { ActionButton, Card, Empty, ErrorBox, Loading, SectionTitle } from '../../components';
|
||||||
|
|
||||||
const KIND_COLOR: Record<string, string> = {
|
const KIND_COLOR: Record<string, string> = {
|
||||||
deployment_failed: colors.err,
|
deployment_failed: colors.err,
|
||||||
@@ -59,6 +59,7 @@ export default function Notifications() {
|
|||||||
) : null
|
) : null
|
||||||
}
|
}
|
||||||
ListEmptyComponent={<Empty text="No notifications" />}
|
ListEmptyComponent={<Empty text="No notifications" />}
|
||||||
|
ListFooterComponent={<PushChannelsCard />}
|
||||||
data={items}
|
data={items}
|
||||||
keyExtractor={(n) => n.id}
|
keyExtractor={(n) => n.id}
|
||||||
renderItem={({ item }) => {
|
renderItem={({ item }) => {
|
||||||
@@ -96,6 +97,122 @@ export default function Notifications() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function PushChannelsCard() {
|
||||||
|
const api = useApi();
|
||||||
|
const qc = useQueryClient();
|
||||||
|
const channels = useQuery({
|
||||||
|
queryKey: ['notification-channels'],
|
||||||
|
queryFn: () => api.notificationChannels(),
|
||||||
|
});
|
||||||
|
const [kind, setKind] = useState<'ntfy' | 'gotify'>('ntfy');
|
||||||
|
const [endpoint, setEndpoint] = useState('');
|
||||||
|
const [token, setToken] = useState('');
|
||||||
|
const [adding, setAdding] = useState(false);
|
||||||
|
|
||||||
|
const invalidate = () => qc.invalidateQueries({ queryKey: ['notification-channels'] });
|
||||||
|
const add = useMutation({
|
||||||
|
mutationFn: () =>
|
||||||
|
api.addNotificationChannel({
|
||||||
|
kind,
|
||||||
|
endpoint: endpoint.trim(),
|
||||||
|
token: token.trim() || undefined,
|
||||||
|
}),
|
||||||
|
onSuccess: () => {
|
||||||
|
setEndpoint('');
|
||||||
|
setToken('');
|
||||||
|
setAdding(false);
|
||||||
|
invalidate();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const remove = useMutation({
|
||||||
|
mutationFn: (id: string) => api.deleteNotificationChannel(id),
|
||||||
|
onSuccess: invalidate,
|
||||||
|
});
|
||||||
|
const test = useMutation({
|
||||||
|
mutationFn: (id: string) => api.testNotificationChannel(id),
|
||||||
|
});
|
||||||
|
|
||||||
|
const list = channels.data ?? [];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={{ marginTop: 24 }}>
|
||||||
|
<SectionTitle>Push channels</SectionTitle>
|
||||||
|
<Card>
|
||||||
|
<Text style={styles.hint}>
|
||||||
|
Relay alerts to a self-hosted ntfy or Gotify server — your phone gets pushes via the ntfy app, no account required here.
|
||||||
|
</Text>
|
||||||
|
{list.map((ch) => (
|
||||||
|
<View key={ch.id} style={styles.channelRow}>
|
||||||
|
<View style={{ flex: 1 }}>
|
||||||
|
<Text style={styles.channelKind}>{ch.kind.toUpperCase()}</Text>
|
||||||
|
<Text style={styles.channelEndpoint} numberOfLines={1}>
|
||||||
|
{ch.endpoint}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
<Text
|
||||||
|
style={styles.channelAction}
|
||||||
|
onPress={() => test.mutate(ch.id)}
|
||||||
|
>
|
||||||
|
{test.isPending ? '…' : 'Test'}
|
||||||
|
</Text>
|
||||||
|
<Text
|
||||||
|
style={[styles.channelAction, { color: colors.err }]}
|
||||||
|
onPress={() => remove.mutate(ch.id)}
|
||||||
|
>
|
||||||
|
Remove
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
))}
|
||||||
|
{adding ? (
|
||||||
|
<View style={{ marginTop: 8 }}>
|
||||||
|
<View style={styles.kindRow}>
|
||||||
|
{(['ntfy', 'gotify'] as const).map((k) => (
|
||||||
|
<Text
|
||||||
|
key={k}
|
||||||
|
style={[styles.kindChip, kind === k && styles.kindChipActive]}
|
||||||
|
onPress={() => setKind(k)}
|
||||||
|
>
|
||||||
|
{k}
|
||||||
|
</Text>
|
||||||
|
))}
|
||||||
|
</View>
|
||||||
|
<TextInput
|
||||||
|
style={styles.input}
|
||||||
|
value={endpoint}
|
||||||
|
onChangeText={setEndpoint}
|
||||||
|
placeholder={kind === 'ntfy' ? 'https://ntfy.example.com/my-alerts' : 'https://gotify.example.com'}
|
||||||
|
placeholderTextColor={colors.textDim}
|
||||||
|
autoCapitalize="none"
|
||||||
|
autoCorrect={false}
|
||||||
|
keyboardType="url"
|
||||||
|
/>
|
||||||
|
<TextInput
|
||||||
|
style={styles.input}
|
||||||
|
value={token}
|
||||||
|
onChangeText={setToken}
|
||||||
|
placeholder={kind === 'ntfy' ? 'Access token (optional)' : 'App token'}
|
||||||
|
placeholderTextColor={colors.textDim}
|
||||||
|
autoCapitalize="none"
|
||||||
|
autoCorrect={false}
|
||||||
|
secureTextEntry
|
||||||
|
/>
|
||||||
|
{add.error ? <ErrorBox error={add.error} /> : null}
|
||||||
|
<ActionButton
|
||||||
|
label={add.isPending ? 'Adding…' : 'Add channel'}
|
||||||
|
disabled={add.isPending || !endpoint.trim()}
|
||||||
|
onPress={() => add.mutate()}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
) : (
|
||||||
|
<Text style={styles.channelAction} onPress={() => setAdding(true)}>
|
||||||
|
+ Add channel
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
root: { flex: 1, backgroundColor: colors.bg },
|
root: { flex: 1, backgroundColor: colors.bg },
|
||||||
row: { flexDirection: 'row', alignItems: 'flex-start' },
|
row: { flexDirection: 'row', alignItems: 'flex-start' },
|
||||||
@@ -104,4 +221,13 @@ const styles = StyleSheet.create({
|
|||||||
body: { color: colors.textDim, fontSize: 13, marginTop: 4, lineHeight: 18 },
|
body: { color: colors.textDim, fontSize: 13, marginTop: 4, lineHeight: 18 },
|
||||||
meta: { color: colors.textDim, fontSize: 11, marginTop: 6 },
|
meta: { color: colors.textDim, fontSize: 11, marginTop: 6 },
|
||||||
markRead: { color: colors.accent, fontSize: 12, fontWeight: '600', marginLeft: 8 },
|
markRead: { color: colors.accent, fontSize: 12, fontWeight: '600', marginLeft: 8 },
|
||||||
|
hint: { color: colors.textDim, fontSize: 12, lineHeight: 17, marginBottom: 8 },
|
||||||
|
channelRow: { flexDirection: 'row', alignItems: 'center', paddingVertical: 8, borderTopWidth: 1, borderTopColor: colors.border },
|
||||||
|
channelKind: { color: colors.text, fontSize: 12, fontWeight: '700' },
|
||||||
|
channelEndpoint: { color: colors.textDim, fontSize: 12, marginTop: 2 },
|
||||||
|
channelAction: { color: colors.accent, fontSize: 12, fontWeight: '600', marginLeft: 12 },
|
||||||
|
kindRow: { flexDirection: 'row', gap: 8, marginBottom: 8 },
|
||||||
|
kindChip: { color: colors.textDim, fontSize: 13, paddingVertical: 4, paddingHorizontal: 12, borderRadius: 12, borderWidth: 1, borderColor: colors.border },
|
||||||
|
kindChipActive: { color: colors.accent, borderColor: colors.accent },
|
||||||
|
input: { color: colors.text, fontSize: 14, borderWidth: 1, borderColor: colors.border, borderRadius: 8, paddingHorizontal: 10, paddingVertical: 8, marginBottom: 8 },
|
||||||
});
|
});
|
||||||
@@ -1,16 +1,28 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import { Stack, useRouter, useSegments } from 'expo-router';
|
import { Stack, useRouter, useSegments } from 'expo-router';
|
||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
import { QueryClient } from '@tanstack/react-query';
|
||||||
|
import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
|
||||||
|
import { createAsyncStoragePersister } from '@tanstack/query-async-storage-persister';
|
||||||
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||||
import { StatusBar } from 'expo-status-bar';
|
import { StatusBar } from 'expo-status-bar';
|
||||||
import { SessionProvider, useSession } from '../session';
|
import { SessionProvider, useSession } from '../session';
|
||||||
import { colors } from '../theme';
|
import { colors } from '../theme';
|
||||||
|
|
||||||
const queryClient = new QueryClient({
|
const queryClient = new QueryClient({
|
||||||
defaultOptions: {
|
defaultOptions: {
|
||||||
queries: { staleTime: 15_000, retry: 1 },
|
queries: { staleTime: 15_000, retry: 1, networkMode: 'offlineFirst' },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// High-churn keys never hit disk — a stale notification count or log
|
||||||
|
// tail is worse than none.
|
||||||
|
const NEVER_PERSIST = new Set(['notifications', 'notification-channels', 'logs', 'connectivity']);
|
||||||
|
|
||||||
|
const persister = createAsyncStoragePersister({
|
||||||
|
storage: AsyncStorage,
|
||||||
|
key: 'containr-query-cache-v1',
|
||||||
|
});
|
||||||
|
|
||||||
function AuthGate() {
|
function AuthGate() {
|
||||||
const { ready, api } = useSession();
|
const { ready, api } = useSession();
|
||||||
const segments = useSegments();
|
const segments = useSegments();
|
||||||
@@ -39,6 +51,7 @@ function AuthGate() {
|
|||||||
<Stack.Screen name="service/logs" options={{ title: 'Logs' }} />
|
<Stack.Screen name="service/logs" options={{ title: 'Logs' }} />
|
||||||
<Stack.Screen name="service/variables" options={{ title: 'Variables' }} />
|
<Stack.Screen name="service/variables" options={{ title: 'Variables' }} />
|
||||||
<Stack.Screen name="service/domains" options={{ title: 'Domains' }} />
|
<Stack.Screen name="service/domains" options={{ title: 'Domains' }} />
|
||||||
|
<Stack.Screen name="service/cron" options={{ title: 'Cron jobs' }} />
|
||||||
<Stack.Screen name="service/settings" options={{ title: 'Service settings' }} />
|
<Stack.Screen name="service/settings" options={{ title: 'Service settings' }} />
|
||||||
</Stack.Protected>
|
</Stack.Protected>
|
||||||
<Stack.Screen name="login" options={{ headerShown: false }} />
|
<Stack.Screen name="login" options={{ headerShown: false }} />
|
||||||
@@ -48,11 +61,21 @@ function AuthGate() {
|
|||||||
|
|
||||||
export default function RootLayout() {
|
export default function RootLayout() {
|
||||||
return (
|
return (
|
||||||
<QueryClientProvider client={queryClient}>
|
<PersistQueryClientProvider
|
||||||
|
client={queryClient}
|
||||||
|
persistOptions={{
|
||||||
|
persister,
|
||||||
|
maxAge: 7 * 24 * 60 * 60 * 1000,
|
||||||
|
dehydrateOptions: {
|
||||||
|
shouldDehydrateQuery: (q) =>
|
||||||
|
q.state.status === 'success' && !NEVER_PERSIST.has(String(q.queryKey[0])),
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
<SessionProvider>
|
<SessionProvider>
|
||||||
<StatusBar style="light" />
|
<StatusBar style="light" />
|
||||||
<AuthGate />
|
<AuthGate />
|
||||||
</SessionProvider>
|
</SessionProvider>
|
||||||
</QueryClientProvider>
|
</PersistQueryClientProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -157,6 +157,11 @@ export default function ServiceDetail() {
|
|||||||
subtitle={s.domain ?? 'Hostnames routed to this service'}
|
subtitle={s.domain ?? 'Hostnames routed to this service'}
|
||||||
onPress={() => router.push(`/service/domains?id=${s.id}`)}
|
onPress={() => router.push(`/service/domains?id=${s.id}`)}
|
||||||
/>
|
/>
|
||||||
|
<Row
|
||||||
|
title="Cron jobs"
|
||||||
|
subtitle="Schedules, run now, history"
|
||||||
|
onPress={() => router.push(`/service/cron?id=${s.id}`)}
|
||||||
|
/>
|
||||||
<Row
|
<Row
|
||||||
title="Scale & sleep"
|
title="Scale & sleep"
|
||||||
subtitle={`${s.replicas ?? 1} replica${(s.replicas ?? 1) === 1 ? '' : 's'}` +
|
subtitle={`${s.replicas ?? 1} replica${(s.replicas ?? 1) === 1 ? '' : 's'}` +
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import { Alert, RefreshControl, ScrollView, StyleSheet, Text, View } from 'react-native';
|
||||||
|
import { useLocalSearchParams } from 'expo-router';
|
||||||
|
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||||
|
import { useApi } from '../../session';
|
||||||
|
import { colors } from '../../theme';
|
||||||
|
import { relTime } from '../../time';
|
||||||
|
import {
|
||||||
|
ActionButton,
|
||||||
|
Card,
|
||||||
|
Empty,
|
||||||
|
ErrorBox,
|
||||||
|
Loading,
|
||||||
|
StatusBadge,
|
||||||
|
} from '../../components';
|
||||||
|
|
||||||
|
export default function ServiceCron() {
|
||||||
|
const { id } = useLocalSearchParams<{ id: string }>();
|
||||||
|
const api = useApi();
|
||||||
|
const qc = useQueryClient();
|
||||||
|
const [historyFor, setHistoryFor] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const jobs = useQuery({
|
||||||
|
queryKey: ['service-cron', id],
|
||||||
|
queryFn: () => api.cronJobs(id!),
|
||||||
|
enabled: !!id,
|
||||||
|
refetchInterval: 15_000,
|
||||||
|
});
|
||||||
|
const executions = useQuery({
|
||||||
|
queryKey: ['cron-executions', historyFor],
|
||||||
|
queryFn: () => api.cronExecutions(historyFor!),
|
||||||
|
enabled: !!historyFor,
|
||||||
|
});
|
||||||
|
|
||||||
|
const trigger = useMutation({
|
||||||
|
mutationFn: (jobId: string) => api.triggerCronJob(jobId),
|
||||||
|
onSuccess: (_d, jobId) => {
|
||||||
|
qc.invalidateQueries({ queryKey: ['service-cron', id] });
|
||||||
|
setHistoryFor(jobId);
|
||||||
|
setTimeout(
|
||||||
|
() => qc.invalidateQueries({ queryKey: ['cron-executions', jobId] }),
|
||||||
|
2000,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
onError: (e) =>
|
||||||
|
Alert.alert('Trigger failed', e instanceof Error ? e.message : String(e)),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (jobs.isLoading) return <Loading />;
|
||||||
|
if (jobs.error) return <ErrorBox error={jobs.error} />;
|
||||||
|
|
||||||
|
const list = jobs.data ?? [];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ScrollView
|
||||||
|
style={styles.root}
|
||||||
|
contentContainerStyle={{ padding: 16 }}
|
||||||
|
refreshControl={
|
||||||
|
<RefreshControl
|
||||||
|
refreshing={jobs.isRefetching}
|
||||||
|
onRefresh={() => jobs.refetch()}
|
||||||
|
tintColor={colors.accent}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{list.length === 0 ? <Empty text="No cron jobs on this service" /> : null}
|
||||||
|
{list.map((job) => (
|
||||||
|
<Card key={job.id}>
|
||||||
|
<View style={styles.jobHead}>
|
||||||
|
<View style={{ flex: 1 }}>
|
||||||
|
<Text style={styles.jobName}>{job.name}</Text>
|
||||||
|
<Text style={styles.meta}>
|
||||||
|
{job.schedule}
|
||||||
|
{job.timezone ? ` · ${job.timezone}` : ''}
|
||||||
|
{job.enabled === false ? ' · disabled' : ''}
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.cmd} numberOfLines={1}>
|
||||||
|
{job.command}
|
||||||
|
</Text>
|
||||||
|
<Text style={styles.meta}>
|
||||||
|
{job.last_run_at ? `last ${relTime(job.last_run_at)}` : 'never run'}
|
||||||
|
{job.next_run_at ? ` · next ${relTime(job.next_run_at)}` : ''}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
{job.last_status ? <StatusBadge status={job.last_status} /> : null}
|
||||||
|
</View>
|
||||||
|
<View style={styles.jobActions}>
|
||||||
|
<ActionButton
|
||||||
|
label="Run now"
|
||||||
|
kind="primary"
|
||||||
|
disabled={trigger.isPending}
|
||||||
|
onPress={() => trigger.mutate(job.id)}
|
||||||
|
/>
|
||||||
|
<ActionButton
|
||||||
|
label={historyFor === job.id ? 'Hide history' : 'History'}
|
||||||
|
onPress={() => setHistoryFor(historyFor === job.id ? null : job.id)}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
{historyFor === job.id ? (
|
||||||
|
<View style={styles.history}>
|
||||||
|
{executions.isLoading ? (
|
||||||
|
<Loading />
|
||||||
|
) : (executions.data ?? []).length === 0 ? (
|
||||||
|
<Text style={styles.meta}>No executions yet</Text>
|
||||||
|
) : (
|
||||||
|
(executions.data ?? []).slice(0, 10).map((ex) => (
|
||||||
|
<View key={ex.id} style={styles.execRow}>
|
||||||
|
<View style={{ flex: 1 }}>
|
||||||
|
<Text style={styles.execTime}>{relTime(ex.started_at)}</Text>
|
||||||
|
{ex.error ? (
|
||||||
|
<Text style={styles.execErr} numberOfLines={2}>
|
||||||
|
{ex.error}
|
||||||
|
</Text>
|
||||||
|
) : ex.output ? (
|
||||||
|
<Text style={styles.execOut} numberOfLines={2}>
|
||||||
|
{ex.output}
|
||||||
|
</Text>
|
||||||
|
) : null}
|
||||||
|
</View>
|
||||||
|
<StatusBadge status={ex.status ?? 'unknown'} />
|
||||||
|
</View>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
) : null}
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
|
</ScrollView>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
root: { flex: 1, backgroundColor: colors.bg },
|
||||||
|
jobHead: { flexDirection: 'row', alignItems: 'flex-start' },
|
||||||
|
jobName: { color: colors.text, fontSize: 15, fontWeight: '600' },
|
||||||
|
meta: { color: colors.textDim, fontSize: 11, marginTop: 3 },
|
||||||
|
cmd: { color: colors.textDim, fontSize: 12, fontFamily: 'monospace', marginTop: 4 },
|
||||||
|
jobActions: { flexDirection: 'row', gap: 8, marginTop: 10 },
|
||||||
|
history: { marginTop: 10, borderTopWidth: 1, borderTopColor: colors.border, paddingTop: 8 },
|
||||||
|
execRow: { flexDirection: 'row', alignItems: 'flex-start', paddingVertical: 6 },
|
||||||
|
execTime: { color: colors.text, fontSize: 12 },
|
||||||
|
execErr: { color: colors.err, fontSize: 11, marginTop: 2 },
|
||||||
|
execOut: { color: colors.textDim, fontSize: 11, marginTop: 2 },
|
||||||
|
});
|
||||||
@@ -2474,6 +2474,114 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
$ref: '#/components/schemas/MessageResponse'
|
$ref: '#/components/schemas/MessageResponse'
|
||||||
|
|
||||||
|
/notifications/channels:
|
||||||
|
get:
|
||||||
|
tags:
|
||||||
|
- Notifications
|
||||||
|
summary: List push notification channels (ntfy/Gotify)
|
||||||
|
security:
|
||||||
|
- bearerAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: Channel list
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
channels:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: '#/components/schemas/NotificationChannel'
|
||||||
|
post:
|
||||||
|
tags:
|
||||||
|
- Notifications
|
||||||
|
summary: Add a push notification channel
|
||||||
|
description: ntfy endpoint should include the topic (e.g. https://ntfy.example.com/my-alerts); Gotify endpoint is the server base URL with the app token in `token`.
|
||||||
|
security:
|
||||||
|
- bearerAuth: []
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
required: [kind, endpoint]
|
||||||
|
properties:
|
||||||
|
kind:
|
||||||
|
type: string
|
||||||
|
enum: [ntfy, gotify]
|
||||||
|
endpoint:
|
||||||
|
type: string
|
||||||
|
format: uri
|
||||||
|
token:
|
||||||
|
type: string
|
||||||
|
description: ntfy access token (Bearer) or Gotify app token
|
||||||
|
responses:
|
||||||
|
'201':
|
||||||
|
description: Channel created
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
channel:
|
||||||
|
$ref: '#/components/schemas/NotificationChannel'
|
||||||
|
'400':
|
||||||
|
$ref: '#/components/schemas/Error'
|
||||||
|
|
||||||
|
/notifications/channels/{id}:
|
||||||
|
delete:
|
||||||
|
tags:
|
||||||
|
- Notifications
|
||||||
|
summary: Delete a push notification channel
|
||||||
|
security:
|
||||||
|
- bearerAuth: []
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: Deleted
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/MessageResponse'
|
||||||
|
'404':
|
||||||
|
$ref: '#/components/schemas/Error'
|
||||||
|
|
||||||
|
/notifications/channels/{id}/test:
|
||||||
|
post:
|
||||||
|
tags:
|
||||||
|
- Notifications
|
||||||
|
summary: Send a test notification through a push channel
|
||||||
|
security:
|
||||||
|
- bearerAuth: []
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: Test delivered
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/MessageResponse'
|
||||||
|
'502':
|
||||||
|
description: Push delivery failed
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/Error'
|
||||||
|
|
||||||
# Outbound Webhooks
|
# Outbound Webhooks
|
||||||
/webhooks:
|
/webhooks:
|
||||||
get:
|
get:
|
||||||
@@ -8158,6 +8266,24 @@ components:
|
|||||||
unread:
|
unread:
|
||||||
type: integer
|
type: integer
|
||||||
|
|
||||||
|
NotificationChannel:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
kind:
|
||||||
|
type: string
|
||||||
|
enum: [ntfy, gotify]
|
||||||
|
endpoint:
|
||||||
|
type: string
|
||||||
|
format: uri
|
||||||
|
enabled:
|
||||||
|
type: boolean
|
||||||
|
created_at:
|
||||||
|
type: string
|
||||||
|
format: date-time
|
||||||
|
|
||||||
OutboundWebhook:
|
OutboundWebhook:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
|||||||
Reference in new issue
Block a user