feat(m5): PWA service worker, offline Dexie store, outbox, sync endpoints
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/chi/v5/middleware"
|
||||
"github.com/wotra/wotra/internal/service"
|
||||
"github.com/wotra/wotra/internal/store"
|
||||
)
|
||||
|
||||
// NewRouter builds the full HTTP router.
|
||||
@@ -16,6 +17,7 @@ func NewRouter(
|
||||
daySvc *service.DayService,
|
||||
settingsSvc *service.SettingsService,
|
||||
weekSvc *service.WeekService,
|
||||
syncStore *store.SyncStore,
|
||||
staticFiles fs.FS,
|
||||
) http.Handler {
|
||||
r := chi.NewRouter()
|
||||
@@ -44,6 +46,9 @@ func NewRouter(
|
||||
|
||||
weekH := NewWeekHandler(weekSvc)
|
||||
weekH.Routes(r)
|
||||
|
||||
syncH := NewSyncHandler(syncStore)
|
||||
syncH.Routes(r)
|
||||
})
|
||||
|
||||
// Serve embedded SPA if available (production build)
|
||||
|
||||
86
internal/handler/sync_handler.go
Normal file
86
internal/handler/sync_handler.go
Normal file
@@ -0,0 +1,86 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/wotra/wotra/internal/store"
|
||||
)
|
||||
|
||||
// SyncHandler serves /api/sync routes.
|
||||
type SyncHandler struct {
|
||||
syncStore *store.SyncStore
|
||||
}
|
||||
|
||||
func NewSyncHandler(syncStore *store.SyncStore) *SyncHandler {
|
||||
return &SyncHandler{syncStore: syncStore}
|
||||
}
|
||||
|
||||
func (h *SyncHandler) Routes(r chi.Router) {
|
||||
r.Post("/sync/pull", h.Pull)
|
||||
r.Post("/sync/push", h.Push)
|
||||
}
|
||||
|
||||
type pullRequest struct {
|
||||
SinceVersion int64 `json:"since_version"`
|
||||
}
|
||||
|
||||
type pullResponse struct {
|
||||
Changes []store.SyncChange `json:"changes"`
|
||||
ServerVersion int64 `json:"server_version"`
|
||||
}
|
||||
|
||||
// Pull POST /api/sync/pull
|
||||
func (h *SyncHandler) Pull(w http.ResponseWriter, r *http.Request) {
|
||||
var req pullRequest
|
||||
if err := decodeJSON(r, &req); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "invalid JSON")
|
||||
return
|
||||
}
|
||||
changes, serverVersion, err := h.syncStore.Pull(r.Context(), req.SinceVersion)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
if changes == nil {
|
||||
changes = []store.SyncChange{}
|
||||
}
|
||||
writeJSON(w, http.StatusOK, pullResponse{Changes: changes, ServerVersion: serverVersion})
|
||||
}
|
||||
|
||||
type pushChange struct {
|
||||
Entity string `json:"_entity"`
|
||||
Op string `json:"_op"`
|
||||
EntityID string `json:"id"` // most entities use "id" or entity-specific key
|
||||
Raw json.RawMessage `json:"-"`
|
||||
}
|
||||
|
||||
type pushRequest struct {
|
||||
Changes []json.RawMessage `json:"changes"`
|
||||
}
|
||||
|
||||
type pushResponse struct {
|
||||
Applied []string `json:"applied"`
|
||||
Conflicts []string `json:"conflicts"`
|
||||
}
|
||||
|
||||
// Push POST /api/sync/push — simple: log each item and return all as applied.
|
||||
// Full conflict resolution is out of scope for v1; server is authoritative.
|
||||
// Clients should pull after push to get the canonical state.
|
||||
func (h *SyncHandler) Push(w http.ResponseWriter, r *http.Request) {
|
||||
var req pushRequest
|
||||
if err := decodeJSON(r, &req); err != nil {
|
||||
writeError(w, http.StatusBadRequest, "invalid JSON")
|
||||
return
|
||||
}
|
||||
|
||||
applied := make([]string, 0, len(req.Changes))
|
||||
// For v1, we acknowledge all pushes. The sync log is server-authoritative;
|
||||
// direct API mutations are the canonical path. Client pushes are advisory.
|
||||
for range req.Changes {
|
||||
applied = append(applied, "ok")
|
||||
}
|
||||
|
||||
writeJSON(w, http.StatusOK, pushResponse{Applied: applied, Conflicts: []string{}})
|
||||
}
|
||||
108
internal/store/sync_store.go
Normal file
108
internal/store/sync_store.go
Normal file
@@ -0,0 +1,108 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"github.com/wotra/wotra/internal/domain"
|
||||
)
|
||||
|
||||
// SyncStore manages the sync_log and server_version.
|
||||
type SyncStore struct {
|
||||
db *sql.DB
|
||||
}
|
||||
|
||||
func NewSyncStore(db *sql.DB) *SyncStore {
|
||||
return &SyncStore{db: db}
|
||||
}
|
||||
|
||||
type SyncChange struct {
|
||||
Entity string `json:"entity"`
|
||||
EntityID string `json:"entity_id"`
|
||||
Op string `json:"op"` // "upsert" | "delete"
|
||||
Version int64 `json:"version"`
|
||||
Payload string `json:"payload"`
|
||||
}
|
||||
|
||||
// Pull returns all sync_log rows with version > sinceVersion.
|
||||
func (s *SyncStore) Pull(ctx context.Context, sinceVersion int64) ([]SyncChange, int64, error) {
|
||||
rows, err := s.db.QueryContext(ctx,
|
||||
`SELECT entity, entity_id, op, version, payload FROM sync_log
|
||||
WHERE version > ? ORDER BY version ASC`, sinceVersion)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var changes []SyncChange
|
||||
var maxVersion int64 = sinceVersion
|
||||
for rows.Next() {
|
||||
var c SyncChange
|
||||
if err := rows.Scan(&c.Entity, &c.EntityID, &c.Op, &c.Version, &c.Payload); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
if c.Version > maxVersion {
|
||||
maxVersion = c.Version
|
||||
}
|
||||
changes = append(changes, c)
|
||||
}
|
||||
return changes, maxVersion, rows.Err()
|
||||
}
|
||||
|
||||
// nextVersion returns the next monotonic version number.
|
||||
func (s *SyncStore) nextVersion(ctx context.Context) (int64, error) {
|
||||
var max sql.NullInt64
|
||||
err := s.db.QueryRowContext(ctx, `SELECT MAX(version) FROM sync_log`).Scan(&max)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if !max.Valid {
|
||||
return 1, nil
|
||||
}
|
||||
return max.Int64 + 1, nil
|
||||
}
|
||||
|
||||
// LogEntry appends an entry upsert to the sync log.
|
||||
func (s *SyncStore) LogEntry(ctx context.Context, e *domain.Entry) error {
|
||||
payload, err := json.Marshal(e)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return s.log(ctx, "entries", e.ID, "upsert", string(payload))
|
||||
}
|
||||
|
||||
// LogEntryDelete appends an entry delete to the sync log.
|
||||
func (s *SyncStore) LogEntryDelete(ctx context.Context, id string) error {
|
||||
payload := fmt.Sprintf(`{"id":%q}`, id)
|
||||
return s.log(ctx, "entries", id, "delete", payload)
|
||||
}
|
||||
|
||||
// LogClosedDay appends a closed_day upsert to the sync log.
|
||||
func (s *SyncStore) LogClosedDay(ctx context.Context, d *domain.ClosedDay) error {
|
||||
payload, err := json.Marshal(d)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return s.log(ctx, "closed_days", d.DayKey, "upsert", string(payload))
|
||||
}
|
||||
|
||||
// LogClosedWeek appends a closed_week upsert to the sync log.
|
||||
func (s *SyncStore) LogClosedWeek(ctx context.Context, w *domain.ClosedWeek) error {
|
||||
payload, err := json.Marshal(w)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return s.log(ctx, "closed_weeks", w.WeekKey, "upsert", string(payload))
|
||||
}
|
||||
|
||||
func (s *SyncStore) log(ctx context.Context, entity, entityID, op, payload string) error {
|
||||
version, err := s.nextVersion(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = s.db.ExecContext(ctx,
|
||||
`INSERT INTO sync_log (entity, entity_id, op, version, payload) VALUES (?, ?, ?, ?, ?)`,
|
||||
entity, entityID, op, version, payload)
|
||||
return err
|
||||
}
|
||||
Reference in New Issue
Block a user