df78d9ccd8
Adds internal/prom package with histograms for HTTP, GORM, B2, APNs, and FCM, wired into the Echo router (HTTPMiddleware + /metrics) and GORM via statement-level callbacks (no ctx plumbing needed). Storage and push clients call ObserveB2Upload / ObserveAPNsSend / ObserveFCMSend at the network round-trip points. Existing internal/monitoring metrics move to /metrics/legacy so the canonical /metrics emits proper histogram buckets for p50/p95/p99 rollups. deploy-k3s/manifests/observability/vmagent.yaml deploys a single-replica vmagent in the honeydue namespace that scrapes api Pods on :8000/metrics every 15s and remote-writes to https://obs.88oakapps.com/api/v1/write with a bearer token (substituted at deploy time from OBS_INGEST_TOKEN in deploy/prod.env). NetworkPolicies allow vmagent egress to api Pods and to the public obs endpoint over :443; the obs side runs VictoriaMetrics + Jaeger + Grafana on 88oakappsUpdate. docs/observability-plan.md captures the full plan including resource budget, instrumentation table, 4-step rollout, and migration triggers. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
218 lines
5.9 KiB
Go
218 lines
5.9 KiB
Go
package push
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/rs/zerolog/log"
|
|
"github.com/sideshow/apns2"
|
|
"github.com/sideshow/apns2/payload"
|
|
"github.com/sideshow/apns2/token"
|
|
|
|
"github.com/treytartt/honeydue-api/internal/config"
|
|
"github.com/treytartt/honeydue-api/internal/prom"
|
|
)
|
|
|
|
// APNsClient handles direct communication with Apple Push Notification service
|
|
type APNsClient struct {
|
|
client *apns2.Client
|
|
topic string
|
|
}
|
|
|
|
// NewAPNsClient creates a new APNs client using token-based authentication
|
|
func NewAPNsClient(cfg *config.PushConfig) (*APNsClient, error) {
|
|
if cfg.APNSKeyPath == "" || cfg.APNSKeyID == "" || cfg.APNSTeamID == "" {
|
|
return nil, fmt.Errorf("APNs configuration incomplete: key_path=%s, key_id=%s, team_id=%s",
|
|
cfg.APNSKeyPath, cfg.APNSKeyID, cfg.APNSTeamID)
|
|
}
|
|
|
|
// Load the APNs auth key (.p8 file)
|
|
authKey, err := token.AuthKeyFromFile(cfg.APNSKeyPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to load APNs auth key from %s: %w", cfg.APNSKeyPath, err)
|
|
}
|
|
|
|
// Create token for authentication
|
|
authToken := &token.Token{
|
|
AuthKey: authKey,
|
|
KeyID: cfg.APNSKeyID,
|
|
TeamID: cfg.APNSTeamID,
|
|
}
|
|
|
|
// Create client - sandbox if APNSSandbox is true, production otherwise.
|
|
// APNSSandbox is the single source of truth (defaults to true for safety).
|
|
var client *apns2.Client
|
|
if cfg.APNSSandbox {
|
|
client = apns2.NewTokenClient(authToken).Development()
|
|
log.Info().Msg("APNs client configured for DEVELOPMENT/SANDBOX")
|
|
} else {
|
|
client = apns2.NewTokenClient(authToken).Production()
|
|
log.Info().Msg("APNs client configured for PRODUCTION")
|
|
}
|
|
|
|
return &APNsClient{
|
|
client: client,
|
|
topic: cfg.APNSTopic,
|
|
}, nil
|
|
}
|
|
|
|
// Send sends a push notification to iOS devices
|
|
func (c *APNsClient) Send(ctx context.Context, tokens []string, title, message string, data map[string]string) error {
|
|
if len(tokens) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// Build the notification payload
|
|
p := payload.NewPayload().
|
|
AlertTitle(title).
|
|
AlertBody(message).
|
|
Sound("default").
|
|
MutableContent()
|
|
|
|
// Add custom data
|
|
for key, value := range data {
|
|
p.Custom(key, value)
|
|
}
|
|
|
|
var errors []error
|
|
successCount := 0
|
|
|
|
for _, deviceToken := range tokens {
|
|
notification := &apns2.Notification{
|
|
DeviceToken: deviceToken,
|
|
Topic: c.topic,
|
|
Payload: p,
|
|
Priority: apns2.PriorityHigh,
|
|
}
|
|
|
|
sendStart := time.Now()
|
|
res, err := c.client.PushWithContext(ctx, notification)
|
|
if err != nil {
|
|
prom.ObserveAPNsSend("error", time.Since(sendStart))
|
|
log.Error().
|
|
Err(err).
|
|
Str("token", truncateToken(deviceToken)).
|
|
Msg("Failed to send APNs notification")
|
|
errors = append(errors, fmt.Errorf("token %s: %w", truncateToken(deviceToken), err))
|
|
continue
|
|
}
|
|
|
|
if !res.Sent() {
|
|
prom.ObserveAPNsSend("bad_token", time.Since(sendStart))
|
|
log.Error().
|
|
Str("token", truncateToken(deviceToken)).
|
|
Str("reason", res.Reason).
|
|
Int("status", res.StatusCode).
|
|
Msg("APNs notification not sent")
|
|
errors = append(errors, fmt.Errorf("token %s: %s (status %d)", truncateToken(deviceToken), res.Reason, res.StatusCode))
|
|
continue
|
|
}
|
|
|
|
prom.ObserveAPNsSend("ok", time.Since(sendStart))
|
|
successCount++
|
|
log.Debug().
|
|
Str("token", truncateToken(deviceToken)).
|
|
Str("apns_id", res.ApnsID).
|
|
Msg("APNs notification sent successfully")
|
|
}
|
|
|
|
log.Info().
|
|
Int("total", len(tokens)).
|
|
Int("success", successCount).
|
|
Int("failed", len(errors)).
|
|
Msg("APNs batch send complete")
|
|
|
|
if len(errors) > 0 && successCount == 0 {
|
|
return fmt.Errorf("all APNs notifications failed: %v", errors)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// SendWithCategory sends a push notification with iOS category for actionable notifications
|
|
func (c *APNsClient) SendWithCategory(ctx context.Context, tokens []string, title, message string, data map[string]string, categoryID string) error {
|
|
if len(tokens) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// Build the notification payload with category
|
|
p := payload.NewPayload().
|
|
AlertTitle(title).
|
|
AlertBody(message).
|
|
Sound("default").
|
|
MutableContent().
|
|
Category(categoryID) // iOS category for actionable notifications
|
|
|
|
// Add custom data
|
|
for key, value := range data {
|
|
p.Custom(key, value)
|
|
}
|
|
|
|
var errors []error
|
|
successCount := 0
|
|
|
|
for _, deviceToken := range tokens {
|
|
notification := &apns2.Notification{
|
|
DeviceToken: deviceToken,
|
|
Topic: c.topic,
|
|
Payload: p,
|
|
Priority: apns2.PriorityHigh,
|
|
}
|
|
|
|
sendStart := time.Now()
|
|
res, err := c.client.PushWithContext(ctx, notification)
|
|
if err != nil {
|
|
prom.ObserveAPNsSend("error", time.Since(sendStart))
|
|
log.Error().
|
|
Err(err).
|
|
Str("token", truncateToken(deviceToken)).
|
|
Str("category", categoryID).
|
|
Msg("Failed to send APNs actionable notification")
|
|
errors = append(errors, fmt.Errorf("token %s: %w", truncateToken(deviceToken), err))
|
|
continue
|
|
}
|
|
|
|
if !res.Sent() {
|
|
prom.ObserveAPNsSend("bad_token", time.Since(sendStart))
|
|
log.Error().
|
|
Str("token", truncateToken(deviceToken)).
|
|
Str("reason", res.Reason).
|
|
Int("status", res.StatusCode).
|
|
Str("category", categoryID).
|
|
Msg("APNs actionable notification not sent")
|
|
errors = append(errors, fmt.Errorf("token %s: %s (status %d)", truncateToken(deviceToken), res.Reason, res.StatusCode))
|
|
continue
|
|
}
|
|
|
|
prom.ObserveAPNsSend("ok", time.Since(sendStart))
|
|
successCount++
|
|
log.Debug().
|
|
Str("token", truncateToken(deviceToken)).
|
|
Str("apns_id", res.ApnsID).
|
|
Str("category", categoryID).
|
|
Msg("APNs actionable notification sent successfully")
|
|
}
|
|
|
|
log.Info().
|
|
Int("total", len(tokens)).
|
|
Int("success", successCount).
|
|
Int("failed", len(errors)).
|
|
Str("category", categoryID).
|
|
Msg("APNs actionable batch send complete")
|
|
|
|
if len(errors) > 0 && successCount == 0 {
|
|
return fmt.Errorf("all APNs actionable notifications failed: %v", errors)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// truncateToken returns first 8 chars of token for logging
|
|
func truncateToken(token string) string {
|
|
if len(token) > 8 {
|
|
return token[:8] + "..."
|
|
}
|
|
return token
|
|
}
|