From 131a7ca01f81304dfa2d1b6d175e7a011b251fbc Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 8 Nov 2026 05:51:47 +0900 Subject: [PATCH] feat(feeds): queue explicit FreshRSS state changes with uncertain-outcome recovery --- docs/design/ja/feeds.md | 39 ++- internal/server/feeds.go | 7 +- internal/server/feeds_actions.go | 171 +++++++++++ internal/server/feeds_actions_test.go | 404 ++++++++++++++++++++++++++ internal/server/feeds_fetch.go | 51 +++- internal/server/feeds_test.go | 22 +- internal/server/testdata/feeds.js | 8 + internal/store/feeds.go | 60 ++-- internal/store/feeds_actions.go | 203 +++++++++++++ internal/store/feeds_test.go | 38 +++ static/js/feeds.js | 26 +- templates/pages/feeds.gohtml | 2 +- 12 files changed, 973 insertions(+), 58 deletions(-) create mode 100644 internal/server/feeds_actions.go create mode 100644 internal/server/feeds_actions_test.go create mode 100644 internal/store/feeds_actions.go diff --git a/docs/design/ja/feeds.md b/docs/design/ja/feeds.md index 9dcb023..49254fa 100644 --- a/docs/design/ja/feeds.md +++ b/docs/design/ja/feeds.md @@ -1,7 +1,7 @@ # 15. RSSビューア・FreshRSS・newsboat 状態:内蔵簡易reader、FreshRSS読取connector、共通viewer、Wiki保存・タスク化、ダッシュボードを実装。 -OPMLの確認付き追加取り込み・書出し、FreshRSS購読・カテゴリのnavigationも実装済み。FreshRSSへの書戻しは残件。本番反映と実FreshRSSへの接続は未実施。 +OPMLの確認付き追加取り込み・書出し、FreshRSS購読・カテゴリのnavigation、opt-inの既読・star書戻しを実装済み。本番反映と実FreshRSSへの接続は未実施。 既存のブログRSS「配信」と、本章の外部RSS「購読」は別機能。 2026-11-08:利用者指定のサブプロジェクト順で最初に実施する。内蔵readerは簡易利用の @@ -33,7 +33,7 @@ FreshRSS停止時は取得済みcacheと鮮度・接続状態を示し、内蔵 ## 実装済みの読取機能 `/v/feeds` に購読一覧、フォルダ、記事一覧、外部原文へのリンク、Wiki保存を提供します。 -FreshRSSの記事・既読・starは取得しますが、状態の変更は送信しません。UIにも読取専用と明示し、 +FreshRSSの記事・既読・starを取得します。既定は読取専用で、source設定で明示的に許可した場合だけ状態の変更を送信します。 FreshRSS passwordを設定時以外にブラウザへ返さず、login tokenはbackend内でのみ利用します。 資格情報は既存の暗号化機構を使い、Domain・所有者・source UUID・用途に束縛します。 @@ -52,7 +52,7 @@ tooltipに残します。タブ名は「RSS」、原文リンクはアイコン `j/k`・上下矢印で移動、`Enter/l`で本文、`Esc/h`で一覧、`/`で件名・配信元検索、`n`で次の未読、 `m`で既読切替、`*`でstar、`r`で背景更新予約、`?`でキー案内です。フォーム入力・IME変換中は -一覧ショートカットを抑止します。FreshRSSでは`m`と`*`も外部変更を行いません。 +一覧ショートカットを抑止します。FreshRSSでは書戻し許可時だけ`m`と`*`で操作を予約します。 HTML本文は見出し・表・箇条書き・強調・リンクを保持して描画し、plain textは文字情報として表示します。 server側の許可リストでscript・イベント属性・任意CSS・form・iframe・画像等を除去し、表示時にも再検査します。 @@ -75,6 +75,9 @@ API prefixは `/_/api/v1/extension/organizer.feeds/`。Domain内の本人専用 | `GET catalog?source=…` | 本人のFreshRSS購読・カテゴリの取得済み一覧。外部通信なし | | `GET item?source=…&id=…` | 本人の記事本文 | | `POST state` | 内蔵read/starの条件付き変更。FreshRSSは拒否 | +| `POST remote-state` | FreshRSSの一記事・一項目の変更を予約。request_id、source、id、field、desired、source_versionを指定 | +| `GET action?source=…&id=…` | 本人の記事の最新操作記録。外部通信なし | +| `POST action/check` | request_idで結果不明操作の読取専用再確認を予約 | | `POST note` | 公開範囲確認付きのWiki単独保存。request_idと入力hashで再送を識別 | | `GET opml/export` | 本人の内蔵購読をOPML 2.0としてダウンロード | | `POST opml/preview` | ファイルを解析し、追加可能・登録済み・重複・未対応等を返す。保存・外部通信なし | @@ -86,6 +89,9 @@ v2で`feed_items.body_html`を追加します。既存のテキスト本文・ v3で`feed_import_receipts`を追加し、購読の一括追加と再送記録を同時保存します。 v4でsourceに購読一覧、記事にremote feed ID・カテゴリIDを追加します。FreshRSSの旧workerを versionで無効化し、次の背景取得を予約します。内蔵sourceのversion・取得予約は変更しません。 +v5でsourceの`write_enabled`(既定OFF)と`feed_actions`を追加します。操作記録はsourceを削除しても保持し、 +送信済みの可能性があるものはunknown、未送信はcancelledにします。DB更新前にバックアップを取得し、 +旧バイナリへの切戻しだけで追加schemaが巻き戻るとは扱いません。 既存テーブルを破壊・再構成しません。SQLiteのforeign_keys設定に依存せず削除を完遂するtriggerを 持ちます。内蔵read/starを本文cacheから分離し、記事を保持窓から落としても状態は黙って消しません。 DBは内蔵購読・状態・保存receiptの正本であり、全体を捨てられるcacheとは扱いません。 @@ -100,6 +106,7 @@ sourceのprovider・URL・資格情報の変更は別sourceを作る契約です | --- | --- | | 個人のsource数 | Domain・本人ごとに32 | | 定期event | `feed.source.sync`、既定60秒周期、低優先度、1回最大4 sourceを直列取得 | +| 書戻しworker | 同じevent内で最大2操作を先に処理。各8秒、取得と合計35秒の予算を共有し、残り9秒未満なら次の操作・取得を開始しない | | source更新間隔 | 5〜1440分、既定30分。取得候補になる間隔であり、混雑時の完了時刻保証ではない | | 通信予算 | 1 source 8秒、batch 35秒、応答/展開後本文4 MiB | | 外部接続 | 公開HTTPS/443のみ。DNS検査・接続先固定、内部アドレス・redirect・proxyを拒否 | @@ -127,22 +134,24 @@ source指定と組み合わせ、既存の未読・star・検索・keysetペー 絞り込み対象は最新200記事のcache内に限られ、購読を選んでも履歴全件を外部取得しません。 購読の追加・削除やカテゴリの編集はFreshRSS側で行います。 -## 既読・star同期を追加する条件 +## 既読とstarの書戻し server-authoritative stateと未送信の操作を分けます。操作ごとのrequest_idで重複を防ぎ、成功応答前に確定済みと表示しません。newsboat等で同時変更された場合、古いローカルcacheをまとめて送り返しません。接続解除・認可失効時は未送信変更を勝手に再送しません。 -FreshRSS APIに条件付き更新がない操作もあり得るため、対応版の実機fixtureで競合動作を確認するまで完全な双方向同期を約束しません。 +FreshRSSへの変更は一項目のtag追加・削除です。更新直前の状態と不可分に照合するCASではないため、 +他clientとの同時操作を完全に直列化する双方向同期ではありません。 -### 書戻しの次段階設計 +### 操作記録と送信状態 -以下は未実装のRSS-3です。購読navigationの追加だけでは書戻しを有効にしません。 -sourceごとに既定OFFの書戻し設定を設け、操作は`read`または`starred`の一項目と希望値に限定します。 +RSS-3は合成環境で実装・検証済みです。sourceごとに既定OFFの「FreshRSSの既読・star変更を許可」を設け、操作は`read`または`starred`の一項目と希望値に限定します。 cache内の他項目を同時に送らず、全件既読・購読編集も初期対象に含めません。 操作記録は記事cacheから分離し、Domain・本人・request_id、source・記事ID、対象項目、希望値、 source version、状態、claim期限を保持します。同一request_idの同じ入力は同じ記録を返し、 違う入力は拒否します。同じ記事に未解決の操作がある間は次の操作を受け付けません。 -受付APIは外部通信せず、低優先度workerが送信します。記録数とworkerの時間予算は必ず有限にします。 +受付APIは外部通信せず、低優先度workerが送信します。Domain・本人ごとに未解決20件、全記録10,000件を上限とし、 +上限で新規受付を拒否します。receiptを自動削除して古い要求を再送可能にすることはしません。 +queuedは受付から5分で失効します。claimは60秒で、期限切れsending/checkingはunknownにし、変更を再送しません。 | 状態 | 次の処理 | | --- | --- | @@ -160,6 +169,15 @@ source version、状態、claim期限を保持します。同一request_idの同 外部clientとの同時変更を原子的に防げないAPIでは、確認直後に状態が再変更される可能性もあります。 readbackは観測結果であり、exactly-onceやリモートCASの保証とは区別します。 +結果不明時は操作欄の`↻`からclaim期限後に再確認できます。書戻し設定をOFFにしても、sourceが有効なら +この読取専用再確認は可能です。画面は未解決操作の間だけ2秒間隔で自サーバーの記録を確認し、 +背景タブでは停止します。記事の既読・star表示は遠隔の状態を確認するまで切り替えません。 +再確認で希望値と異なる場合はconflictを表示し、新しい変更は利用者が明示的に操作します。 + +外部APIはlogin、記事参照、変更token、edit-tag、記事再参照の順です。記事の個別参照は +`POST stream/items/contents`(読取操作)、変更は`POST edit-tag`に`i`・`T`・`a`または`r`一項目を送ります。 +URLや本文、資格情報を操作記録・ログへ保存しません。[FreshRSS API実装](https://github.com/FreshRSS/FreshRSS/blob/edge/p/api/greader.php)。 + 受入テストは、opt-inなしの拒否、同じ操作の再送、別項目の保持、送信前の権限失効、 送信直後の応答喪失、worker停止・再起動、unknownの読取専用再確認、source削除・設定変更、 通常取得との排他、他clientによる同時変更を含めます。実サービスを使わない合成fixtureで @@ -222,7 +240,8 @@ Wiki単独は親Path配下の `rss-{request UUID}` に新規作成します。 - [x] RSS-1:read-only FreshRSS connectorと合成fixture。実接続の受入は別。 - [x] RSS-2:安全な共通一覧、出典付きWiki保存、任意のタスク化、ダッシュボード。 -- [ ] RSS-3:FreshRSSへの明示的な既読/star操作と送信状態・競合・再送の契約。 +- [x] RSS-3:opt-inの既読/star書戻し、操作receipt、背景処理、readback、結果不明の再確認、失効・競合・排他の合成試験。 +- [ ] RSS-3b:未解決操作の総覧、cache窓から落ちた記事や削除sourceの操作記録確認、保全付きreceiptの整理。既存のGET action/action/checkは記事IDで利用できる。 - [x] RSS-4a:内蔵簡易reader、購読設定、既読・star、背景取得。 - [x] RSS-4b:OPML export/importのpreview、選択追加、重複確認、原子的な保存と再送防止。置換・状態移行は範囲外。 - [ ] RSS-5:FreshRSS実環境の接続先・版・API資格情報を指定してread-only受入。 diff --git a/internal/server/feeds.go b/internal/server/feeds.go index b2fcba2..49498fd 100644 --- a/internal/server/feeds.go +++ b/internal/server/feeds.go @@ -42,6 +42,9 @@ func (s *Server) handleFeeds(w http.ResponseWriter, r *http.Request) { return } key := strings.TrimPrefix(r.URL.Path, feedsAPI) + if s.handleFeedAction(w, r, domain, actor, key) { + return + } if strings.HasPrefix(key, "opml/") { s.handleFeedOPML(w, r, domain, actor, key) return @@ -211,6 +214,6 @@ func (s *Server) handleFeeds(w http.ResponseWriter, r *http.Request) { func init() { translations["en"]["feeds.title"] = "RSS" translations["ja"]["feeds.title"] = "RSS" - translations["en"]["feeds.help"] = "Private local feeds and read-only FreshRSS integration" - translations["ja"]["feeds.help"] = "個人用の簡易RSSとFreshRSS読取連携" + translations["en"]["feeds.help"] = "Private local feeds and FreshRSS integration with optional read/star updates" + translations["ja"]["feeds.help"] = "個人用の簡易RSSとFreshRSS連携(既読・star変更は任意)" } diff --git a/internal/server/feeds_actions.go b/internal/server/feeds_actions.go new file mode 100644 index 0000000..414ca3d --- /dev/null +++ b/internal/server/feeds_actions.go @@ -0,0 +1,171 @@ +package server + +import ( + "context" + "errors" + "net/http" + "net/url" + "strings" + "time" + + "pageswiki/internal/store" +) + +func freshRSSItem(ctx context.Context, client *http.Client, base, auth, id string) (*store.FeedItem, error) { + // FreshRSS uses POST for this read-only item lookup (not GET ?i=...). + raw, _, _, e := feedRequest(ctx, client, "POST", base+"/reader/api/0/stream/items/contents", auth, url.Values{"i": {id}}, nil) + if e != nil { + return nil, e + } + items, e := parseFreshRSSItems(raw, base) + if e != nil { + return nil, e + } + if len(items) != 1 || items[0].ID != id { + return nil, errFeedInvalid + } + return &items[0], nil +} +func feedActionMatches(a store.FeedAction, i *store.FeedItem) bool { + if a.Field == "read" { + return i.Read == a.Desired + } + return i.Starred == a.Desired +} + +func (s *Server) runFeedAction(ctx context.Context, client *http.Client, a store.FeedAction, source store.FeedSource) (status, code string, observed *store.FeedItem) { + status = "failed" + if a.Status == "checking" { + status = "unknown" + } + fail := func(e error) (string, string, *store.FeedItem) { + c := e.Error() + switch c { + case "network", "credentials", "remote_error", "limit", "invalid_feed": + default: + c = "invalid_feed" + } + return status, c, nil + } + if !validCalendarSourceURL(source.URL) { + return fail(errFeedInvalid) + } + user, password, e := s.store.OpenFeedCredential(source) + if e != nil { + return fail(errors.New("credentials")) + } + auth, e := freshRSSLogin(ctx, client, source, user, password) + if e != nil { + return fail(e) + } + base := strings.TrimRight(source.URL, "/") + item, e := freshRSSItem(ctx, client, base, auth, a.ID) + if e != nil { + return fail(e) + } + if feedActionMatches(a, item) { + return "confirmed", "", item + } + if a.Status == "checking" { + return "conflict", "conflict", item + } + raw, _, _, e := feedRequest(ctx, client, "GET", base+"/reader/api/0/token", auth, nil, nil) + if e != nil { + return fail(e) + } + token := strings.TrimSpace(string(raw)) + if token == "" || len(token) > 4096 || strings.ContainsAny(token, "\r\n") { + return fail(errFeedInvalid) + } + if e = s.store.MarkFeedActionSending(ctx, a, source); e != nil { + return fail(e) + } + // From this point every uncertain result is terminal until an explicit + // read-only recheck. Neither the worker nor a repeated HTTP request resends. + status = "unknown" + field := "r" + if a.Desired { + field = "a" + } + form := url.Values{"i": {a.ID}, "T": {token}, field: {"user/-/state/com.google/" + a.Field}} + raw, _, _, e = feedRequest(ctx, client, "POST", base+"/reader/api/0/edit-tag", auth, form, nil) + if e != nil { + return fail(e) + } + if strings.TrimSpace(string(raw)) != "OK" { + return fail(errFeedInvalid) + } + item, e = freshRSSItem(ctx, client, base, auth, a.ID) + if e != nil { + return fail(e) + } + if !feedActionMatches(a, item) { + return "conflict", "conflict", item + } + return "confirmed", "", item +} +func (s *Server) syncFeedActions(ctx context.Context, client *http.Client) error { + actions, e := s.store.DueFeedActions(ctx) + if e != nil { + return e + } + for _, a := range actions { + if ctx.Err() != nil { + break + } + if deadline, ok := ctx.Deadline(); ok && time.Until(deadline) < 9*time.Second { + break + } + a, source, e := s.store.ClaimFeedAction(ctx, a) + if e != nil { + continue + } + child, cancel := context.WithTimeout(ctx, 8*time.Second) + status, code, item := s.runFeedAction(child, client, a, source) + cancel() + e = s.store.CompleteFeedAction(ctx, a, source, status, code, item) + if e != nil && !errors.Is(e, store.ErrAccessDenied) && !errors.Is(e, store.ErrTaskConflict) { + return e + } + } + return nil +} + +func (s *Server) handleFeedAction(w http.ResponseWriter, r *http.Request, domain, actor, key string) bool { + switch { + case key == "action" && r.Method == "GET": + a, e := s.store.FeedAction(r.Context(), domain, actor, r.URL.Query().Get("source"), r.URL.Query().Get("id")) + if e != nil { + taskError(w, e) + return true + } + writeEventJSON(w, 200, map[string]any{"action": a}) + return true + case key == "remote-state" && r.Method == "POST": + var input store.FeedAction + if !taskJSON(w, r, &input) { + return true + } + a, e := s.store.QueueFeedAction(r.Context(), domain, actor, input) + if e != nil { + taskError(w, e) + return true + } + writeEventJSON(w, 202, map[string]any{"action": a}) + return true + case key == "action/check" && r.Method == "POST": + var input struct { + RequestID string `json:"request_id"` + } + if !taskJSON(w, r, &input) { + return true + } + if e := s.store.RecheckFeedAction(r.Context(), domain, actor, input.RequestID); e != nil { + taskError(w, e) + return true + } + writeEventJSON(w, 202, map[string]bool{"ok": true}) + return true + } + return false +} diff --git a/internal/server/feeds_actions_test.go b/internal/server/feeds_actions_test.go new file mode 100644 index 0000000..09a5860 --- /dev/null +++ b/internal/server/feeds_actions_test.go @@ -0,0 +1,404 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "io" + "net/http" + "strings" + "testing" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func feedActionFixture(t *testing.T) (*Server, string, string, string, store.FeedSource) { + t.Helper() + s, token, domain, actor, _ := feedFixture(t) + ctx := context.Background() + v := store.FeedSource{UUID: uuid.NewString(), Provider: "freshrss", Title: "Remote", URL: "https://example.org/api/greader.php", Enabled: true, WriteEnabled: true, Interval: 300} + v.Credential, _ = s.store.SealFeedCredential(domain, actor, v.UUID, "reader", "secret") + if _, e := s.store.SaveFeedSource(ctx, domain, actor, v); e != nil { + t.Fatal(e) + } + all, e := s.store.FeedSources(ctx, domain, actor) + if e != nil { + t.Fatal(e) + } + for _, x := range all { + if x.UUID == v.UUID { + v = x + } + } + c, e := s.store.ClaimFeed(ctx, v) + if e != nil { + t.Fatal(e) + } + if e = s.store.CompleteFeed(ctx, c, []store.FeedItem{{ID: "one", Title: "Article", Starred: true}}, "", "", "", false); e != nil { + t.Fatal(e) + } + return s, token, domain, actor, v +} +func newFeedAction(v store.FeedSource) store.FeedAction { + return store.FeedAction{RequestID: uuid.NewString(), Source: v.UUID, ID: "one", Field: "read", Desired: true, SourceVersion: v.Version} +} + +type feedRemoteFake struct { + id string + read, star, timeout bool + edits, lookups, requests int + beforeEdit func() + afterEdit func() +} + +func (f *feedRemoteFake) client(t *testing.T) *http.Client { + return &http.Client{Transport: feedTransportFunc(func(r *http.Request) (*http.Response, error) { + id := f.id + if id == "" { + id = "one" + } + f.requests++ + body := "" + switch { + case strings.HasSuffix(r.URL.Path, "/ClientLogin"): + body = "Auth=test-auth" + case strings.HasSuffix(r.URL.Path, "/stream/items/contents"): + if r.Method != "POST" { + t.Fatal("read lookup requires POST") + } + r.ParseForm() + if r.Form.Get("i") != id { + t.Fatal("wrong item") + } + f.lookups++ + cats := []string{} + if f.read { + cats = append(cats, "user/reader/state/com.google/read") + } + if f.star { + cats = append(cats, "user/reader/state/com.google/starred") + } + raw, _ := json.Marshal(map[string]any{"items": []map[string]any{{"id": id, "title": "Article", "categories": cats}}}) + body = string(raw) + case strings.HasSuffix(r.URL.Path, "/token"): + body = "write-token" + if f.beforeEdit != nil { + f.beforeEdit() + } + case strings.HasSuffix(r.URL.Path, "/edit-tag"): + if r.Method != "POST" { + t.Fatal("mutation method") + } + r.ParseForm() + if len(r.Form) != 3 || r.Form.Get("T") != "write-token" || r.Form.Get("i") != id { + t.Fatal("unexpected mutation fields", r.Form) + } + if tag := r.Form.Get("a"); tag != "" { + switch tag { + case "user/-/state/com.google/read": + f.read = true + case "user/-/state/com.google/starred": + f.star = true + default: + t.Fatal("wrong tag", tag) + } + } else { + switch r.Form.Get("r") { + case "user/-/state/com.google/read": + f.read = false + case "user/-/state/com.google/starred": + f.star = false + default: + t.Fatal("wrong tag") + } + } + f.edits++ + if f.afterEdit != nil { + f.afterEdit() + } + if f.timeout { + return nil, errors.New("synthetic response lost after apply") + } + body = "OK" + default: + t.Fatal("unexpected path", r.URL.Path) + } + return &http.Response{StatusCode: 200, Header: http.Header{}, Body: io.NopCloser(strings.NewReader(body))}, nil + })} +} +func TestFeedActionWritebackReceiptAndIsolation(t *testing.T) { + s, token, domain, actor, v := feedActionFixture(t) + ctx := context.Background() + a := newFeedAction(v) + w := feedRequestTest(s, token, "POST", "remote-state", a) + if w.Code != 202 { + t.Fatal(w.Code, w.Body) + } + if w = feedRequestTest(s, token, "POST", "remote-state", a); w.Code != 202 { + t.Fatal("replay", w.Code, w.Body) + } + changed := a + changed.Desired = false + if w = feedRequestTest(s, token, "POST", "remote-state", changed); w.Code != 412 { + t.Fatal("changed replay", w.Code) + } + changed.RequestID = uuid.NewString() + if w = feedRequestTest(s, token, "POST", "remote-state", changed); w.Code != 412 { + t.Fatal("parallel intent", w.Code) + } + item, _ := s.store.FeedItem(ctx, domain, actor, v.UUID, "one") + if item.Read { + t.Fatal("optimistic cache mutation") + } + f := &feedRemoteFake{star: true} + if e := s.syncFeedActions(ctx, f.client(t)); e != nil { + t.Fatal(e) + } + got, e := s.store.FeedAction(ctx, domain, actor, v.UUID, "one") + if e != nil || got.Status != "confirmed" || f.edits != 1 { + t.Fatal(got, e, f.edits) + } + item, _ = s.store.FeedItem(ctx, domain, actor, v.UUID, "one") + if !item.Read || !item.Starred { + t.Fatal("unrelated star overwritten", item) + } + if w = feedRequestTest(s, token, "POST", "remote-state", a); w.Code != 202 { + t.Fatal("receipt replay", w.Code) + } + if e = s.syncFeedActions(ctx, f.client(t)); e != nil || f.edits != 1 { + t.Fatal("replayed write", e, f.edits) + } + // A second explicit intent already satisfied remotely causes no edit-tag. + a.RequestID = uuid.NewString() + if _, e = s.store.QueueFeedAction(ctx, domain, actor, a); e != nil { + t.Fatal(e) + } + if e = s.syncFeedActions(ctx, f.client(t)); e != nil || f.edits != 1 { + t.Fatal("redundant write", e) + } + other, e := s.store.CreatePasswordAccount(domain, "actionother", "long test password", "Other", "") + if e != nil { + t.Fatal(e) + } + if got, e = s.store.FeedAction(ctx, domain, other.UUID, v.UUID, "one"); e != nil || got != nil { + t.Fatal("other owner receipt", got, e) + } + a.RequestID = uuid.NewString() + if _, e = s.store.QueueFeedAction(ctx, domain, other.UUID, a); e == nil { + t.Fatal("other owner mutation") + } + v.Credential = "" + v.WriteEnabled = false + if _, e = s.store.SaveFeedSource(ctx, domain, actor, v); e != nil { + t.Fatal(e) + } + a.SourceVersion++ + if _, e = s.store.QueueFeedAction(ctx, domain, actor, a); e == nil { + t.Fatal("opt-out ignored") + } +} +func TestFeedActionUnknownNeverResendsAndReadOnlyRecheck(t *testing.T) { + s, _, domain, actor, v := feedActionFixture(t) + ctx := context.Background() + a := newFeedAction(v) + if _, e := s.store.QueueFeedAction(ctx, domain, actor, a); e != nil { + t.Fatal(e) + } + f := &feedRemoteFake{star: true, timeout: true} + client := f.client(t) + if e := s.syncFeedActions(ctx, client); e != nil { + t.Fatal(e) + } + got, e := s.store.FeedAction(ctx, domain, actor, v.UUID, "one") + if e != nil || got.Status != "unknown" { + t.Fatal(got, e) + } + item, _ := s.store.FeedItem(ctx, domain, actor, v.UUID, "one") + if item.Read { + t.Fatal("unconfirmed cache") + } + requests := f.requests + if e = s.syncFeedActions(ctx, client); e != nil || f.requests != requests { + t.Fatal("automatic retry", e) + } + if e = s.store.RecheckFeedAction(ctx, domain, actor, a.RequestID); e == nil { + t.Fatal("must wait for claim expiry") + } + // Simulate the uncertainty cooldown without sleeping. + v.Credential = "" + v.WriteEnabled = false + if _, e = s.store.SaveFeedSource(ctx, domain, actor, v); e != nil { + t.Fatal(e) + } + s.store.DB.Exec(`UPDATE feed_actions SET until_ms=0 WHERE request_id=?`, a.RequestID) + if e = s.store.RecheckFeedAction(ctx, domain, actor, a.RequestID); e != nil { + t.Fatal(e) + } + if e = s.syncFeedActions(ctx, client); e != nil { + t.Fatal(e) + } + got, e = s.store.FeedAction(ctx, domain, actor, v.UUID, "one") + if e != nil || got.Status != "confirmed" || f.edits != 1 { + t.Fatal("recheck sent a write", got, e, f.edits) + } +} +func TestFeedActionConflictAndPostSendFence(t *testing.T) { + for _, changed := range []bool{false, true} { + t.Run(map[bool]string{false: "remote_conflict", true: "source_changed"}[changed], func(t *testing.T) { + s, _, domain, actor, v := feedActionFixture(t) + ctx := context.Background() + a := newFeedAction(v) + if _, e := s.store.QueueFeedAction(ctx, domain, actor, a); e != nil { + t.Fatal(e) + } + f := &feedRemoteFake{star: true} + f.afterEdit = func() { + if changed { + v.Credential = "" + v.WriteEnabled = false + if _, e := s.store.SaveFeedSource(ctx, domain, actor, v); e != nil { + t.Fatal(e) + } + } else { + f.read = false + } + } + if e := s.syncFeedActions(ctx, f.client(t)); e != nil { + t.Fatal(e) + } + got, e := s.store.FeedAction(ctx, domain, actor, v.UUID, "one") + want := "conflict" + if changed { + want = "unknown" + } + if e != nil || got.Status != want || f.edits != 1 { + t.Fatal(got, e) + } + item, e := s.store.FeedItem(ctx, domain, actor, v.UUID, "one") + if e != nil || item.Read { + t.Fatal("unconfirmed/fenced value stored", item, e) + } + }) + } +} + +func TestFeedActionFencesAndRecovery(t *testing.T) { + for _, scenario := range []string{"config", "delete", "readonly", "extension", "crash"} { + t.Run(scenario, func(t *testing.T) { + s, _, domain, actor, v := feedActionFixture(t) + ctx := context.Background() + a := newFeedAction(v) + if _, e := s.store.QueueFeedAction(ctx, domain, actor, a); e != nil { + t.Fatal(e) + } + if scenario == "crash" { + due, e := s.store.DueFeedActions(ctx) + if e != nil || len(due) != 1 { + t.Fatal(e) + } + a, source, e := s.store.ClaimFeedAction(ctx, due[0]) + if e != nil { + t.Fatal(e) + } + if _, e = s.store.ClaimFeed(ctx, v); !errors.Is(e, store.ErrTaskConflict) { + t.Fatal("fetch overlapped mutation", e) + } + if e = s.store.MarkFeedActionSending(ctx, a, source); e != nil { + t.Fatal(e) + } + s.store.DB.Exec(`UPDATE feed_actions SET until_ms=0 WHERE request_id=?`, a.RequestID) + due, e = s.store.DueFeedActions(ctx) + if e != nil || len(due) != 0 { + t.Fatal("crash requeued", due, e) + } + got, _ := s.store.FeedAction(ctx, domain, actor, v.UUID, "one") + if got.Status != "unknown" { + t.Fatal(got) + } + return + } + f := &feedRemoteFake{star: true} + f.beforeEdit = func() { + var e error + switch scenario { + case "config": + v.Credential = "" + v.WriteEnabled = false + _, e = s.store.SaveFeedSource(ctx, domain, actor, v) + case "delete": + e = s.store.FeedSourceAction(ctx, domain, actor, v.UUID, "delete", v.Version) + case "readonly": + e = s.store.SetPrincipalState(domain, actor, "readonly") + case "extension": + e = s.setSystemExtensionEnabled(domain, "organizer.feeds", false) + } + if e != nil { + t.Fatal(e) + } + } + if e := s.syncFeedActions(ctx, f.client(t)); e != nil { + t.Fatal(e) + } + if f.edits != 0 { + t.Fatal("sent after revocation") + } + }) + } +} + +func TestFeedActionSingleFieldAndConcurrentIntent(t *testing.T) { + for _, field := range []string{"read", "starred"} { + for _, desired := range []bool{false, true} { + t.Run(field+map[bool]string{false: "_remove", true: "_add"}[desired], func(t *testing.T) { + s, _, domain, actor, v := feedActionFixture(t) + ctx := context.Background() + a := newFeedAction(v) + a.Field = field + a.Desired = desired + results := make(chan error, 2) + for range 2 { + go func() { + copy := a + copy.RequestID = uuid.NewString() + _, e := s.store.QueueFeedAction(ctx, domain, actor, copy) + results <- e + }() + } + success := 0 + for range 2 { + e := <-results + if e == nil { + success++ + } else if !errors.Is(e, store.ErrTaskConflict) { + t.Fatal(e) + } + } + if success != 1 { + t.Fatal("concurrent intents accepted", success) + } + f := &feedRemoteFake{read: true, star: true} + if field == "read" { + f.read = !desired + } else { + f.star = !desired + } + if e := s.syncFeedActions(ctx, f.client(t)); e != nil { + t.Fatal(e) + } + if f.edits != 1 { + t.Fatal("wrong edit count", f.edits) + } + if field == "read" { + if f.read != desired || !f.star { + t.Fatal("wrong field changed") + } + } else { + if f.star != desired || !f.read { + t.Fatal("wrong field changed") + } + } + }) + } + } +} diff --git a/internal/server/feeds_fetch.go b/internal/server/feeds_fetch.go index 43eeeeb..12b43ff 100644 --- a/internal/server/feeds_fetch.go +++ b/internal/server/feeds_fetch.go @@ -328,11 +328,11 @@ func feedRequest(ctx context.Context, client *http.Client, method, target, auth } return raw, res.Header, res.StatusCode, nil } -func fetchFreshRSS(ctx context.Context, client *http.Client, v store.FeedSource, user, password string, catalogs ...*[]store.FeedRemoteSubscription) ([]store.FeedItem, error) { +func freshRSSLogin(ctx context.Context, client *http.Client, v store.FeedSource, user, password string) (string, error) { base := strings.TrimRight(v.URL, "/") raw, _, _, e := feedRequest(ctx, client, "POST", base+"/accounts/ClientLogin", "", url.Values{"Email": {user}, "Passwd": {password}}, nil) if e != nil { - return nil, e + return "", e } auth := "" for _, line := range strings.Split(string(raw), "\n") { @@ -341,12 +341,38 @@ func fetchFreshRSS(ctx context.Context, client *http.Client, v store.FeedSource, } } if auth == "" || len(auth) > 4096 || strings.ContainsAny(auth, "\r\n") { - return nil, errors.New("credentials") + return "", errors.New("credentials") } - raw, _, _, e = feedRequest(ctx, client, "GET", base+"/reader/api/0/stream/contents/reading-list?output=json&n=200", auth, nil, nil) + return auth, nil +} +func fetchFreshRSS(ctx context.Context, client *http.Client, v store.FeedSource, user, password string, catalogs ...*[]store.FeedRemoteSubscription) ([]store.FeedItem, error) { + base := strings.TrimRight(v.URL, "/") + auth, e := freshRSSLogin(ctx, client, v, user, password) if e != nil { return nil, e } + raw, _, _, e := feedRequest(ctx, client, "GET", base+"/reader/api/0/stream/contents/reading-list?output=json&n=200", auth, nil, nil) + if e != nil { + return nil, e + } + items, e := parseFreshRSSItems(raw, base) + if e != nil { + return nil, e + } + if len(catalogs) > 0 { + raw, _, _, e = feedRequest(ctx, client, "GET", base+"/reader/api/0/subscription/list?output=json", auth, nil, nil) + if e != nil { + return nil, e + } + catalog, e := parseFreshRSSCatalog(raw) + if e != nil { + return nil, e + } + *catalogs[0] = catalog + } + return items, nil +} +func parseFreshRSSItems(raw []byte, base string) ([]store.FeedItem, error) { var response struct { Items []struct { ID string `json:"id"` @@ -411,17 +437,6 @@ func fetchFreshRSS(ctx context.Context, client *http.Client, v store.FeedSource, } out = append(out, item) } - if len(catalogs) > 0 { - raw, _, _, e = feedRequest(ctx, client, "GET", base+"/reader/api/0/subscription/list?output=json", auth, nil, nil) - if e != nil { - return nil, e - } - catalog, e := parseFreshRSSCatalog(raw) - if e != nil { - return nil, e - } - *catalogs[0] = catalog - } return out, nil } @@ -465,6 +480,9 @@ func (s *Server) syncFeedSources(ctx context.Context, job *store.EventJob) error func (s *Server) syncFeedSourcesWithClient(ctx context.Context, job *store.EventJob, client *http.Client) error { ctx, cancel := context.WithTimeout(ctx, 35*time.Second) defer cancel() + if e := s.syncFeedActions(ctx, client); e != nil { + return e + } sources, e := s.store.DueFeedSources(ctx) if e != nil { return e @@ -474,6 +492,9 @@ func (s *Server) syncFeedSourcesWithClient(ctx context.Context, job *store.Event if ctx.Err() != nil { break } + if deadline, ok := ctx.Deadline(); ok && time.Until(deadline) < 9*time.Second { + break + } if !s.systemExtensionEnabled(v.Domain, "organizer.feeds") { continue } diff --git a/internal/server/feeds_test.go b/internal/server/feeds_test.go index 567118a..5dcd936 100644 --- a/internal/server/feeds_test.go +++ b/internal/server/feeds_test.go @@ -543,7 +543,12 @@ func TestFeedsChromium(t *testing.T) { if e = s.store.CompleteFeed(context.Background(), claim, items, "", "", "", false); e != nil { t.Fatal(e) } - fresh, e := s.store.SaveFeedSource(context.Background(), domain, actor, store.FeedSource{UUID: uuid.NewString(), Provider: "freshrss", Title: "FreshRSS fixture", URL: "https://example.org/api/greader.php", Enabled: true, Interval: 300}) + fresh := store.FeedSource{UUID: uuid.NewString(), Provider: "freshrss", Title: "FreshRSS fixture", URL: "https://example.org/api/greader.php", Enabled: true, Interval: 300} + fresh.Credential, e = s.store.SealFeedCredential(domain, actor, fresh.UUID, "fixture", "synthetic") + if e != nil { + t.Fatal(e) + } + fresh, e = s.store.SaveFeedSource(context.Background(), domain, actor, fresh) if e != nil { t.Fatal(e) } @@ -577,6 +582,15 @@ func TestFeedsChromium(t *testing.T) { web := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { r.Host = "localhost" r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/fixture/run-feed-actions" && r.Method == "POST" { + fake := &feedRemoteFake{id: "catalog-b"} + if e := s.syncFeedActions(r.Context(), fake.client(t)); e != nil { + http.Error(w, "test worker failed", 500) + return + } + w.WriteHeader(204) + return + } if r.URL.Path == "/fixture" { w.Header().Set("Content-Type", "text/html; charset=utf-8") fmt.Fprint(w, "") @@ -586,6 +600,12 @@ func TestFeedsChromium(t *testing.T) { })) defer web.Close() for _, width := range []string{"1440", "390"} { + if _, e = s.store.DB.Exec(`DELETE FROM feed_actions WHERE source_uuid=?`, fresh.UUID); e != nil { + t.Fatal(e) + } + if _, e = s.store.DB.Exec(`UPDATE feed_items SET is_read=0 WHERE source_uuid=?`, fresh.UUID); e != nil { + t.Fatal(e) + } ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) args := []string{"internal/server/testdata/vim-browser-smoke.mjs", web.URL + "/fixture?width=" + url.QueryEscape(width), t.TempDir(), "/tmp/pageswiki-feeds-" + width + ".png", width, "850"} out, e := exec.CommandContext(ctx, "node", args...).CombinedOutput() diff --git a/internal/server/testdata/feeds.js b/internal/server/testdata/feeds.js index 9ddeafd..8810d6b 100644 --- a/internal/server/testdata/feeds.js +++ b/internal/server/testdata/feeds.js @@ -33,6 +33,14 @@ d.getElementById('feed-category').value='';d.getElementById('feed-category').dispatchEvent(new w.Event('change'));await wait(()=>d.querySelectorAll('.feed-row').length===2); d.querySelector('.feed-subscriptions button[data-feed="feed/2"]').click();await wait(()=>d.querySelectorAll('.feed-row').length===1&&d.querySelector('.feed-row').textContent.includes('Catalog second')); d.querySelector('.feed-row').click();await wait(()=>d.querySelector('#feed-reader .feed-body'));assert(d.querySelectorAll('#feed-reader .feed-actions button:disabled').length===2,'FreshRSS not read-only'); + [...d.querySelectorAll('.feed-source')].find(n=>n.textContent.includes('FreshRSS fixture')).querySelector('button:last-child').click();await wait(()=>d.querySelector('#feed-reader form')); + const setting=d.querySelector('#feed-reader form');setting.querySelectorAll('input[type=checkbox]')[1].checked=true;setting.requestSubmit();await wait(()=>!d.querySelector('#feed-reader form')&&d.querySelectorAll('.feed-row').length===1); + d.querySelector('.feed-row').click();await wait(()=>d.querySelector('#feed-reader .feed-body')&&!d.querySelectorAll('#feed-reader .feed-actions button')[1].disabled); + d.querySelectorAll('#feed-reader .feed-actions button')[1].click();await wait(()=>d.querySelector('.feed-action-status')?.textContent==='◷');assert(d.querySelector('.feed-row').classList.contains('unread'),'Queued state shown as confirmed'); + const run=await w.fetch('/fixture/run-feed-actions',{method:'POST'});assert(run.status===204,'Background worker failed');await wait(()=>d.querySelector('.feed-action-status')?.textContent==='✓');assert(!d.querySelector('.feed-row').classList.contains('unread'),'Confirmed state not reflected'); + // Restore the synthetic source to read-only for the second viewport run. + const api='/_/api/v1/extension/organizer.feeds/',source=(await (await w.fetch(api+'sources')).json()).sources.find(s=>s.title==='FreshRSS fixture'); + await w.fetch(api+'sources',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({uuid:source.uuid,version:source.version,provider:source.provider,title:source.title,folder:source.folder,url:source.url,interval_seconds:source.interval_seconds,enabled:true,write_enabled:false})}); if(w.innerWidth<=600)d.querySelector('#feed-toolbar button').click(); assert(d.documentElement.scrollWidth<=w.innerWidth,'Catalog overflow');document.body.dataset.vimReady='1'; }catch(e){const out=document.createElement('pre');out.id='error';out.textContent=e.stack;document.body.append(out);} diff --git a/internal/store/feeds.go b/internal/store/feeds.go index 3238caa..7f63ee8 100644 --- a/internal/store/feeds.go +++ b/internal/store/feeds.go @@ -44,6 +44,16 @@ var feedMigrations = []db.SQLMigration{{Version: 1, Name: "private_feed_reader", `ALTER TABLE feed_items ADD COLUMN remote_categories TEXT NOT NULL DEFAULT '[]'`, `UPDATE feed_sources SET next_ms=0,lease='',lease_until=0,version=version+1 WHERE provider='freshrss'`, }, Assertions: []string{schemaColumns("feed_sources", "remote_catalog"), schemaColumns("feed_items", "remote_feed,remote_categories")}, +}, { + Version: 5, Name: "feed_explicit_remote_actions", Statements: []string{ + `ALTER TABLE feed_sources ADD COLUMN write_enabled INTEGER NOT NULL DEFAULT 0`, + `CREATE TABLE feed_actions(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,request_id TEXT NOT NULL,source_uuid TEXT NOT NULL,item_id TEXT NOT NULL,field TEXT NOT NULL,desired INTEGER NOT NULL,source_version INTEGER NOT NULL,status TEXT NOT NULL,claim TEXT NOT NULL DEFAULT '',until_ms INTEGER NOT NULL DEFAULT 0,created_ms INTEGER NOT NULL,error TEXT NOT NULL DEFAULT '',PRIMARY KEY(domain_uuid,owner_uuid,request_id))`, + `CREATE INDEX feed_actions_due ON feed_actions(status,created_ms)`, + `CREATE INDEX feed_actions_item ON feed_actions(domain_uuid,owner_uuid,source_uuid,item_id,created_ms DESC)`, + `CREATE UNIQUE INDEX feed_actions_active ON feed_actions(source_uuid,item_id) WHERE status IN ('queued','preparing','sending','unknown','check_queued','checking')`, + `CREATE TRIGGER feed_actions_source_change AFTER UPDATE OF version ON feed_sources BEGIN UPDATE feed_actions SET status=CASE WHEN status IN ('sending','unknown','check_queued','checking') THEN 'unknown' ELSE 'cancelled' END,error='source_changed' WHERE source_uuid=old.uuid AND status IN ('queued','preparing','sending','unknown','check_queued','checking'); END`, + `CREATE TRIGGER feed_actions_source_delete AFTER DELETE ON feed_sources BEGIN UPDATE feed_actions SET status=CASE WHEN status IN ('sending','unknown','check_queued','checking') THEN 'unknown' ELSE 'cancelled' END,error='source_deleted' WHERE source_uuid=old.uuid AND status IN ('queued','preparing','sending','unknown','check_queued','checking'); END`, + }, Assertions: []string{schemaColumns("feed_sources", "write_enabled"), schemaUnique("feed_actions", "domain_uuid,owner_uuid,request_id")}, }} // CaptureFeedNote creates an inert Wiki note and receipt atomically. It does not @@ -111,24 +121,25 @@ func (s *Store) CaptureFeedNote(ctx context.Context, domain, owner, request, sou } type FeedSource struct { - UUID string `json:"uuid"` - Domain string `json:"-"` - Owner string `json:"-"` - Provider string `json:"provider"` - Title string `json:"title"` - Folder string `json:"folder"` - URL string `json:"url"` - Credential string `json:"-"` - Version int64 `json:"version"` - Enabled bool `json:"enabled"` - Interval int `json:"interval_seconds"` - NextMS int64 `json:"next_ms"` - Lease string `json:"-"` - LeaseUntil int64 `json:"-"` - LastMS int64 `json:"last_ms"` - Error string `json:"error"` - ETag string `json:"-"` - Modified string `json:"-"` + UUID string `json:"uuid"` + Domain string `json:"-"` + Owner string `json:"-"` + Provider string `json:"provider"` + Title string `json:"title"` + Folder string `json:"folder"` + URL string `json:"url"` + Credential string `json:"-"` + Version int64 `json:"version"` + Enabled bool `json:"enabled"` + Interval int `json:"interval_seconds"` + NextMS int64 `json:"next_ms"` + Lease string `json:"-"` + LeaseUntil int64 `json:"-"` + LastMS int64 `json:"last_ms"` + Error string `json:"error"` + ETag string `json:"-"` + Modified string `json:"-"` + WriteEnabled bool `json:"write_enabled"` } type FeedItem struct { Source string `json:"source"` @@ -148,10 +159,10 @@ type FeedItem struct { RemoteCategories []string `json:"remote_categories,omitempty"` } -const feedSourceColumns = `uuid,domain_uuid,owner_uuid,provider,title,folder,url,credential,version,enabled,interval_seconds,next_ms,lease,lease_until,last_ms,error,etag,modified` +const feedSourceColumns = `uuid,domain_uuid,owner_uuid,provider,title,folder,url,credential,version,enabled,interval_seconds,next_ms,lease,lease_until,last_ms,error,etag,modified,write_enabled` func scanFeedSource(row interface{ Scan(...any) error }) (v FeedSource, e error) { - e = row.Scan(&v.UUID, &v.Domain, &v.Owner, &v.Provider, &v.Title, &v.Folder, &v.URL, &v.Credential, &v.Version, &v.Enabled, &v.Interval, &v.NextMS, &v.Lease, &v.LeaseUntil, &v.LastMS, &v.Error, &v.ETag, &v.Modified) + e = row.Scan(&v.UUID, &v.Domain, &v.Owner, &v.Provider, &v.Title, &v.Folder, &v.URL, &v.Credential, &v.Version, &v.Enabled, &v.Interval, &v.NextMS, &v.Lease, &v.LeaseUntil, &v.LastMS, &v.Error, &v.ETag, &v.Modified, &v.WriteEnabled) return } func feedActor(ctx context.Context, q interface { @@ -216,6 +227,9 @@ func (s *Store) FeedSources(ctx context.Context, domain, owner string) ([]FeedSo return out, rows.Err() } func (s *Store) SaveFeedSource(ctx context.Context, domain, owner string, v FeedSource) (FeedSource, error) { + if v.WriteEnabled && v.Provider != "freshrss" { + return v, ErrTaskInvalid + } if _, e := uuid.Parse(v.UUID); e != nil { return v, ErrTaskInvalid } @@ -228,7 +242,7 @@ func (s *Store) SaveFeedSource(ctx context.Context, domain, owner string, v Feed if v.Version == 0 { old, lookup := scanFeedSource(tx.QueryRowContext(ctx, `SELECT `+feedSourceColumns+` FROM feed_sources WHERE uuid=?`, v.UUID)) if lookup == nil { - if old.Domain != domain || old.Owner != owner || old.Version != 1 || old.Provider != v.Provider || old.Title != v.Title || old.Folder != v.Folder || old.URL != v.URL || old.Interval != v.Interval || old.Enabled != v.Enabled { + if old.Domain != domain || old.Owner != owner || old.Version != 1 || old.Provider != v.Provider || old.Title != v.Title || old.Folder != v.Folder || old.URL != v.URL || old.Interval != v.Interval || old.Enabled != v.Enabled || old.WriteEnabled != v.WriteEnabled { return ErrTaskConflict } if old.Credential != v.Credential { @@ -256,7 +270,7 @@ func (s *Store) SaveFeedSource(ctx context.Context, domain, owner string, v Feed if n >= 32 { return ErrTaskDAVLimit } - _, e := tx.ExecContext(ctx, `INSERT INTO feed_sources(uuid,domain_uuid,owner_uuid,provider,title,folder,url,credential,version,enabled,interval_seconds) VALUES(?,?,?,?,?,?,?,?,1,?,?)`, v.UUID, domain, owner, v.Provider, v.Title, v.Folder, v.URL, v.Credential, v.Enabled, v.Interval) + _, e := tx.ExecContext(ctx, `INSERT INTO feed_sources(uuid,domain_uuid,owner_uuid,provider,title,folder,url,credential,version,enabled,interval_seconds,write_enabled) VALUES(?,?,?,?,?,?,?,?,1,?,?,?)`, v.UUID, domain, owner, v.Provider, v.Title, v.Folder, v.URL, v.Credential, v.Enabled, v.Interval, v.WriteEnabled) return e } old, e := scanFeedSource(tx.QueryRowContext(ctx, `SELECT `+feedSourceColumns+` FROM feed_sources WHERE uuid=? AND domain_uuid=? AND owner_uuid=?`, v.UUID, domain, owner)) @@ -267,7 +281,7 @@ func (s *Store) SaveFeedSource(ctx context.Context, domain, owner string, v Feed if old.Provider != v.Provider || old.URL != v.URL || v.Credential != "" { return ErrTaskInvalid } - result, e := tx.ExecContext(ctx, `UPDATE feed_sources SET title=?,folder=?,enabled=?,interval_seconds=?,version=version+1,next_ms=0,lease='',lease_until=0 WHERE uuid=? AND version=?`, v.Title, v.Folder, v.Enabled, v.Interval, v.UUID, v.Version) + result, e := tx.ExecContext(ctx, `UPDATE feed_sources SET title=?,folder=?,enabled=?,interval_seconds=?,write_enabled=?,version=version+1,next_ms=0,lease='',lease_until=0 WHERE uuid=? AND version=?`, v.Title, v.Folder, v.Enabled, v.Interval, v.WriteEnabled, v.UUID, v.Version) if e != nil { return e } diff --git a/internal/store/feeds_actions.go b/internal/store/feeds_actions.go new file mode 100644 index 0000000..4895e4e --- /dev/null +++ b/internal/store/feeds_actions.go @@ -0,0 +1,203 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "time" + + "github.com/google/uuid" +) + +type FeedAction struct { + Domain string `json:"-"` + Owner string `json:"-"` + RequestID string `json:"request_id"` + Source string `json:"source"` + ID string `json:"id"` + Field string `json:"field"` + Desired bool `json:"desired"` + SourceVersion int64 `json:"source_version"` + Status string `json:"status"` + Claim string `json:"-"` + UntilMS int64 `json:"-"` + CreatedMS int64 `json:"created_ms"` + Error string `json:"error"` +} + +const feedActionColumns = `domain_uuid,owner_uuid,request_id,source_uuid,item_id,field,desired,source_version,status,claim,until_ms,created_ms,error` + +func scanFeedAction(row interface{ Scan(...any) error }) (a FeedAction, e error) { + e = row.Scan(&a.Domain, &a.Owner, &a.RequestID, &a.Source, &a.ID, &a.Field, &a.Desired, &a.SourceVersion, &a.Status, &a.Claim, &a.UntilMS, &a.CreatedMS, &a.Error) + return +} +func (s *Store) FeedAction(ctx context.Context, domain, owner, source, id string) (*FeedAction, error) { + if e := feedActor(ctx, s.DB, domain, owner, false); e != nil { + return nil, e + } + a, e := scanFeedAction(s.DB.QueryRowContext(ctx, `SELECT `+feedActionColumns+` FROM feed_actions WHERE domain_uuid=? AND owner_uuid=? AND source_uuid=? AND item_id=? ORDER BY created_ms DESC,rowid DESC LIMIT 1`, domain, owner, source, id)) + if errors.Is(e, sql.ErrNoRows) { + return nil, nil + } + return &a, e +} +func (s *Store) QueueFeedAction(ctx context.Context, domain, owner string, a FeedAction) (FeedAction, error) { + if _, e := uuid.Parse(a.RequestID); e != nil { + return a, ErrTaskInvalid + } + if (a.Field != "read" && a.Field != "starred") || a.ID == "" || len(a.ID) > 1024 { + return a, ErrTaskInvalid + } + a.Domain, a.Owner = domain, owner + a.Error, a.Claim, a.UntilMS = "", "", 0 + e := s.feedWrite(ctx, domain, owner, func(tx *sql.Tx) error { + old, e := scanFeedAction(tx.QueryRowContext(ctx, `SELECT `+feedActionColumns+` FROM feed_actions WHERE domain_uuid=? AND owner_uuid=? AND request_id=?`, domain, owner, a.RequestID)) + if e == nil { + if old.Source != a.Source || old.ID != a.ID || old.Field != a.Field || old.Desired != a.Desired || old.SourceVersion != a.SourceVersion { + return ErrTaskConflict + } + a = old + return nil + } + if !errors.Is(e, sql.ErrNoRows) { + return e + } + var allowed bool + if e = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM feed_sources s JOIN feed_items i ON i.source_uuid=s.uuid WHERE s.domain_uuid=? AND s.owner_uuid=? AND s.uuid=? AND i.id=? AND s.provider='freshrss' AND s.enabled=1 AND s.write_enabled=1 AND s.version=?)`, domain, owner, a.Source, a.ID, a.SourceVersion).Scan(&allowed); e != nil { + return e + } + if !allowed { + return ErrTaskConflict + } + var total, pending int + if e = tx.QueryRowContext(ctx, `SELECT count(*),COALESCE(sum(status IN ('queued','preparing','sending','unknown','check_queued','checking')),0) FROM feed_actions WHERE domain_uuid=? AND owner_uuid=?`, domain, owner).Scan(&total, &pending); e != nil { + return e + } + if total >= 10000 || pending >= 20 { + return ErrTaskDAVLimit + } + if e = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM feed_actions WHERE source_uuid=? AND item_id=? AND status IN ('queued','preparing','sending','unknown','check_queued','checking'))`, a.Source, a.ID).Scan(&allowed); e != nil { + return e + } + if allowed { + return ErrTaskConflict + } + a.Status, a.CreatedMS = "queued", time.Now().UnixMilli() + _, e = tx.ExecContext(ctx, `INSERT INTO feed_actions(domain_uuid,owner_uuid,request_id,source_uuid,item_id,field,desired,source_version,status,created_ms) VALUES(?,?,?,?,?,?,?,?,?,?)`, domain, owner, a.RequestID, a.Source, a.ID, a.Field, a.Desired, a.SourceVersion, a.Status, a.CreatedMS) + return e + }) + return a, e +} + +// Recheck is deliberately read-only at the remote side, even with writeback OFF. +func (s *Store) RecheckFeedAction(ctx context.Context, domain, owner, request string) error { + return s.feedWrite(ctx, domain, owner, func(tx *sql.Tx) error { + r, e := tx.ExecContext(ctx, `UPDATE feed_actions SET status='check_queued',error='' WHERE domain_uuid=? AND owner_uuid=? AND request_id=? AND status='unknown' AND until_ms?)`, state, a.Claim, a.UntilMS, a.Domain, a.Owner, a.RequestID, a.Status, now-300000) + if e = feedActionAffected(r, e); e != nil { + return e + } + a.Status = state + source.Lease = a.Claim + source.LeaseUntil = a.UntilMS + return nil + }) + return a, source, e +} +func (s *Store) MarkFeedActionSending(ctx context.Context, a FeedAction, source FeedSource) error { + return s.feedWrite(ctx, a.Domain, a.Owner, func(tx *sql.Tx) error { + r, e := tx.ExecContext(ctx, `UPDATE feed_actions SET status='sending' WHERE domain_uuid=? AND owner_uuid=? AND request_id=? AND claim=? AND status='preparing' AND until_ms>? AND EXISTS(SELECT 1 FROM feed_sources WHERE uuid=? AND enabled=1 AND write_enabled=1 AND version=? AND lease=?)`, a.Domain, a.Owner, a.RequestID, a.Claim, time.Now().UnixMilli(), a.Source, source.Version, a.Claim) + return feedActionAffected(r, e) + }) +} +func (s *Store) CompleteFeedAction(ctx context.Context, a FeedAction, source FeedSource, status, code string, observed *FeedItem) error { + if (observed != nil && observed.ID != a.ID) || ((status == "confirmed" || status == "conflict") && observed == nil) { + return ErrTaskInvalid + } + if status != "confirmed" && status != "unknown" && status != "failed" && status != "conflict" { + return ErrTaskInvalid + } + switch code { + case "", "network", "credentials", "invalid_feed", "remote_error", "conflict", "limit": + default: + return ErrTaskInvalid + } + return s.feedWrite(ctx, a.Domain, a.Owner, func(tx *sql.Tx) error { + r, e := tx.ExecContext(ctx, `UPDATE feed_sources SET lease='',lease_until=0 WHERE uuid=? AND version=? AND lease=? AND lease_until>? AND enabled=1`, a.Source, source.Version, a.Claim, time.Now().UnixMilli()) + if e = feedActionAffected(r, e); e != nil { + return e + } + r, e = tx.ExecContext(ctx, `UPDATE feed_actions SET status=?,error=?,until_ms=CASE WHEN ?='unknown' THEN until_ms ELSE 0 END WHERE domain_uuid=? AND owner_uuid=? AND request_id=? AND claim=? AND status IN ('preparing','sending','checking')`, status, code, status, a.Domain, a.Owner, a.RequestID, a.Claim) + if e = feedActionAffected(r, e); e != nil { + return e + } + if observed != nil { + _, e = tx.ExecContext(ctx, `UPDATE feed_items SET is_read=?,starred=? WHERE source_uuid=? AND id=?`, observed.Read, observed.Starred, a.Source, a.ID) + } + return e + }) +} diff --git a/internal/store/feeds_test.go b/internal/store/feeds_test.go index 461607b..a8345b2 100644 --- a/internal/store/feeds_test.go +++ b/internal/store/feeds_test.go @@ -150,3 +150,41 @@ func TestFeedCatalogMigrationRollbackAndRepeat(t *testing.T) { t.Fatal(integrity, e) } } + +func TestFeedActionsMigrationRollbackAndRepeat(t *testing.T) { + st := newSchemaTestStore(t) + ctx := context.Background() + if e := db.ApplySQLiteMigrations(ctx, st.DB, "feeds", feedMigrations[:4]); e != nil { + t.Fatal(e) + } + if _, e := st.DB.Exec(`INSERT INTO feed_sources(uuid,domain_uuid,owner_uuid,provider,title,folder,url,version,enabled,interval_seconds) VALUES('s','d','u','freshrss','Title','','https://example.org',7,1,300)`); e != nil { + t.Fatal(e) + } + broken := append([]db.SQLMigration(nil), feedMigrations...) + broken[4].Statements = append(append([]string(nil), feedMigrations[4].Statements...), `INSERT INTO no_such_feed_table VALUES(1)`) + if e := db.ApplySQLiteMigrations(ctx, st.DB, "feeds", broken); e == nil { + t.Fatal("expected failure") + } + var count int + if e := st.DB.QueryRow(`SELECT count(*) FROM pragma_table_info('feed_sources') WHERE name='write_enabled'`).Scan(&count); e != nil || count != 0 { + t.Fatal("partial schema", count, e) + } + for range 2 { + if e := st.ensureSchemaComponent("feeds"); e != nil { + t.Fatal(e) + } + } + if e := st.DB.QueryRow(`SELECT write_enabled FROM feed_sources WHERE uuid='s'`).Scan(&count); e != nil || count != 0 { + t.Fatal("write enabled during upgrade", count, e) + } + if _, e := st.DB.Exec(`INSERT INTO feed_actions(domain_uuid,owner_uuid,request_id,source_uuid,item_id,field,desired,source_version,status,created_ms) VALUES('d','u','r','s','i','read',1,7,'sending',1); DELETE FROM feed_sources WHERE uuid='s'`); e != nil { + t.Fatal(e) + } + var status string + if e := st.DB.QueryRow(`SELECT status FROM feed_actions WHERE request_id='r'`).Scan(&status); e != nil || status != "unknown" { + t.Fatal("lost uncertain receipt", status, e) + } + if e := st.DB.QueryRow(`PRAGMA integrity_check`).Scan(&status); e != nil || status != "ok" { + t.Fatal(status, e) + } +} diff --git a/static/js/feeds.js b/static/js/feeds.js index b0f65d5..9bfd793 100644 --- a/static/js/feeds.js +++ b/static/js/feeds.js @@ -11,6 +11,13 @@ const post=(path,body)=>request(path,{method:'POST',body:JSON.stringify(body)}); let sources=[],items=[],selected=-1,currentSource='',filter='',search='',next=null,loading=false,seq=0,detailSeq=0,editing=false,controller,detailController; let remoteFeed='',remoteCategory='',catalog=[],catalogSeq=0,catalogController; + let actionTimer; + const pendingAction=a=>a&&['queued','preparing','sending','unknown','check_queued','checking'].includes(a.status); + async function updateAction(item){const version=detailSeq;const data=await request('action?'+new URLSearchParams({source:item.source,id:item.id}));if(version!==detailSeq||items[selected]!==item||editing)return;item.action=data.action;item.actionLoading=false; + if(data.action&&['confirmed','conflict'].includes(data.action.status)){const fresh=(await request('item?'+new URLSearchParams({source:item.source,id:item.id}))).item;if(version!==detailSeq||items[selected]!==item||editing)return;Object.assign(item,fresh);drawRows();}renderItem(item); + } + function pollAction(item){clearTimeout(actionTimer);if(document.hidden||!item.action||!['queued','preparing','sending','check_queued','checking'].includes(item.action.status))return;actionTimer=setTimeout(()=>{if(items[selected]===item&&!editing)updateAction(item).catch(report);},2000);} + document.addEventListener('visibilitychange',()=>{if(document.hidden)clearTimeout(actionTimer);else{const item=items[selected];if(item?.provider==='freshrss'&&!editing)updateAction(item).catch(report);}}); const sourceLabel=el('strong','RSS'),searchbox=el('input');searchbox.type='search';searchbox.placeholder=t('Search titles / feeds… /','件名・配信元を検索… /');searchbox.ariaLabel=searchbox.placeholder; const filters=el('select');for(const [v,en,jp]of [['','All','すべて'],['unread','Unread','未読'],['starred','Starred','star付き']]){const o=el('option',t(en,jp));o.value=v;filters.append(o);}filters.ariaLabel=t('Filter','絞り込み');filters.onchange=()=>{filter=filters.value;load(false).catch(report);}; const refresh=button('↻',t('Queue source refresh (r)','背景更新を予約 (r)'),queueRefresh);refresh.disabled=!writable; @@ -56,20 +63,26 @@ async function queueRefresh(){const targets=sources.filter(s=>s.enabled&&(!currentSource||currentSource===s.uuid));for(const s of targets)await post('sources/'+s.uuid+'/refresh',{version:s.version});status.textContent=t('Refresh queued','更新を予約しました');} toolbar.append(button('⟳',t('Reload cached list','取得済み一覧を再読込'),reload)); async function open(index){if(index<0||index>=items.length)return;editing=false;selected=index;detailController?.abort();detailController=new AbortController();const version=++detailSeq;for(const [i,row]of [...rows.querySelectorAll('.feed-row')].entries())row.setAttribute('aria-selected',String(i===index));rows.setAttribute('aria-activedescendant','feed-row-'+index);document.getElementById('feed-row-'+index)?.scrollIntoView({block:'nearest'}); - layout.classList.add('reading');reader.replaceChildren(el('p',t('Loading…','読み込み中…')));const item=(await request('item?'+new URLSearchParams({source:items[index].source,id:items[index].id}),{signal:detailController.signal})).item;if(version!==detailSeq)return;items[index]=item;renderItem(item); + layout.classList.add('reading');reader.replaceChildren(el('p',t('Loading…','読み込み中…')));const item=(await request('item?'+new URLSearchParams({source:items[index].source,id:items[index].id}),{signal:detailController.signal})).item;if(version!==detailSeq)return;items[index]=item;if(item.provider==='freshrss'){item.actionLoading=true;renderItem(item);await updateAction(item);}else renderItem(item); } function renderItem(item){reader.replaceChildren();const actions=el('div',undefined,'feed-actions');actions.append(button('←',t('Back to list','一覧へ戻る'),closeReader)); - const read=button(item.read?'●':'○',t('Toggle read state (m)','既読/未読 (m)'),()=>setState(!item.read,item.starred));const star=button(item.starred?'★':'☆',t('Toggle star (*)','star切替 (*)'),()=>setState(item.read,!item.starred));read.disabled=star.disabled=!writable||item.provider!=='local';actions.append(read,star); + const canWrite=item.provider==='local'||sources.some(s=>s.uuid===item.source&&s.enabled&&s.write_enabled); + const read=button(item.read?'●':'○',t('Toggle read state (m)','既読/未読 (m)'),()=>setState(!item.read,item.starred));const star=button(item.starred?'★':'☆',t('Toggle star (*)','star切替 (*)'),()=>setState(item.read,!item.starred));read.disabled=star.disabled=!writable||!canWrite||item.actionLoading||pendingAction(item.action);actions.append(read,star); + if(item.action){const a=item.action,labels={queued:t('Queued','送信待ち'),preparing:t('Checking','確認中'),sending:t('Sending','送信中'),checking:t('Rechecking','再確認中'),check_queued:t('Recheck queued','再確認待ち'),confirmed:t('Confirmed','確認済み'),unknown:t('Result unknown — recheck after one minute','結果不明 — 1分後に再確認'),conflict:t('Changed elsewhere — review before retrying','状態が一致しません。確認してから再操作してください'),failed:t('Not sent','未送信'),cancelled:t('Cancelled','中止')};const label=labels[a.status]||a.status; + const state=button(a.status==='unknown'?'↻':pendingAction(a)?'◷':a.status==='confirmed'?'✓':'!',label,async()=>{if(a.status!=='unknown')return;await post('action/check',{request_id:a.request_id});await updateAction(item);});state.className='feed-action-status';state.disabled=a.status!=='unknown'||!writable;state.title+=(a.error?' · '+a.error:'');actions.append(state);} if(item.url){const a=el('a',undefined,'feed-original');a.title=a.ariaLabel=t('Open original','原文を開く');a.href=item.url;a.target='_blank';a.rel='noopener noreferrer';const svg=document.createElementNS('http://www.w3.org/2000/svg','svg'),path=document.createElementNS(svg.namespaceURI,'path');svg.setAttribute('viewBox','0 0 24 24');svg.setAttribute('aria-hidden','true');path.setAttribute('d','M14 3h7v7M21 3l-11 11M10 5H5a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-5');svg.append(path);a.append(svg);actions.append(a);} if(writable)actions.append(button(t('+ Wiki / Task','+ Wiki・タスク'),t('Capture with attribution','出典付きで取り込む'),()=>captureForm(item))); reader.append(actions,el('h1',item.title||t('(Untitled)','(無題)')),el('p',(item.feed||'')+' · '+(item.published_ms?new Date(item.published_ms).toLocaleString():t('Date unknown','日付不明')),'feed-meta')); - if(item.provider==='freshrss')read.title=star.title=t('FreshRSS · read only','FreshRSS · 読取専用'); + if(item.provider==='freshrss'&&!canWrite)read.title=star.title=t('FreshRSS · read only','FreshRSS · 読取専用'); const body=el('div',undefined,'feed-body'); if(item.body_html){body.classList.add('feed-body-html');const shadow=body.attachShadow({mode:'open'}),style=el('style',':host{display:block;overflow-wrap:anywhere;line-height:1.6}p{margin:.6em 0}h1,h2,h3{line-height:1.3}a{color:var(--link,var(--accent,#659de4))}pre{white-space:pre-wrap;overflow-wrap:anywhere;padding:.5em;background:color-mix(in srgb,currentColor 5%,transparent)}blockquote{margin:.5em 0;padding-left:1em;border-left:3px solid var(--border,#8885)}table{border-collapse:collapse;max-width:100%;display:block;overflow:auto}th,td{padding:.3em .6em;border:1px solid var(--border,#8885)}');const content=el('div');content.innerHTML=item.body_html;shadow.append(style,content);} else body.textContent=item.body||t('(No article text)','(本文なし)'); reader.append(body); + pollAction(item); } - async function setState(read,starred){const item=items[selected];if(!item||!writable||item.provider!=='local')return;const source=item.source,id=item.id;const data=await post('state',{source,id,read,starred,version:item.version});Object.assign(item,{read,starred,version:data.version});drawRows();if(items[selected]===item&&!editing)renderItem(item);} + async function setState(read,starred){const item=items[selected];if(!item||!writable||item.actionLoading||pendingAction(item.action))return;const source=item.source,id=item.id; + if(item.provider==='freshrss'){const config=sources.find(s=>s.uuid===source);if(!config?.enabled||!config?.write_enabled)return;const field=read!==item.read?'read':'starred',desired=field==='read'?read:starred;if(item[field]===desired)return;item.actionLoading=true;renderItem(item);try{await post('remote-state',{request_id:crypto.randomUUID(),source,id,field,desired,source_version:config.version});}finally{await updateAction(item);}return;} + const data=await post('state',{source,id,read,starred,version:item.version});Object.assign(item,{read,starred,version:data.version});drawRows();if(items[selected]===item&&!editing)renderItem(item);} function field(form,label,value='',type='text'){const wrap=el('label',label),input=el('input');input.type=type;input.value=value;wrap.append(input);form.append(wrap);return input;} function opmlForm(){ editing=true;detailSeq++;detailController?.abort();layout.classList.add('reading');reader.replaceChildren(); @@ -105,11 +118,12 @@ const user=field(form,t('FreshRSS user','FreshRSSユーザー')),password=field(form,t('FreshRSS API password','FreshRSS APIパスワード'),'','password');password.autocomplete='new-password'; const interval=field(form,t('Refresh interval (minutes, 5–1440)','更新間隔(分、5〜1440)'),String((source?.interval_seconds||1800)/60),'number');interval.min='5';interval.max='1440';interval.required=true; const enabled=field(form,t('Enabled','有効'),'','checkbox');enabled.checked=source?source.enabled:true; - const toggle=()=>{user.parentElement.hidden=password.parentElement.hidden=!!source||provider.value!=='freshrss';user.required=password.required=!source&&provider.value==='freshrss';};provider.onchange=toggle;toggle(); + const write=field(form,t('Allow FreshRSS read/star changes','FreshRSSの既読・star変更を許可'),'','checkbox');write.checked=!!source?.write_enabled; + const toggle=()=>{write.parentElement.hidden=provider.value!=='freshrss';user.parentElement.hidden=password.parentElement.hidden=!!source||provider.value!=='freshrss';user.required=password.required=!source&&provider.value==='freshrss';};provider.onchange=toggle;toggle(); if(source)form.append(el('p',t('Last success: ','最終成功: ')+(source.last_ms?new Date(source.last_ms).toLocaleString():'—')+' · '+(source.error||'OK'),'feed-meta')); const sourceID=source?.uuid||crypto.randomUUID(); const save=el('button',t('Save','保存'));save.type='submit';buttons.append(save,button(t('Cancel','取消'),'',closeReader));if(source)buttons.append(button(t('Delete source','購読元を削除'),'',async()=>{if(!confirm(t('Delete this source, cached articles and local read/star state?','購読元・取得記事・内蔵の既読/star状態を削除しますか?')))return;await post('sources/'+source.uuid+'/delete',{version:source.version});currentSource='';await reload();}));form.append(buttons); - form.onsubmit=async event=>{event.preventDefault();save.disabled=true;try{await post('sources',{uuid:sourceID,version:source?.version||0,provider:provider.value,title:title.value,folder:folder.value,url:url.value,interval_seconds:Number(interval.value)*60,enabled:enabled.checked,username:user.value,password:password.value});password.value='';await reload();status.textContent=t('Saved','保存しました');}catch(e){report(e);}finally{save.disabled=false;}};title.focus(); + form.onsubmit=async event=>{event.preventDefault();save.disabled=true;try{await post('sources',{uuid:sourceID,version:source?.version||0,provider:provider.value,title:title.value,folder:folder.value,url:url.value,interval_seconds:Number(interval.value)*60,enabled:enabled.checked,write_enabled:provider.value==='freshrss'&&write.checked,username:user.value,password:password.value});password.value='';await reload();status.textContent=t('Saved','保存しました');}catch(e){report(e);}finally{save.disabled=false;}};title.focus(); } function captureForm(item){ editing=true;detailSeq++;reader.replaceChildren();const form=el('form');reader.append(form);form.append(el('h1',t('Attributed Wiki note / task','出典付きWikiメモ・タスク'))); diff --git a/templates/pages/feeds.gohtml b/templates/pages/feeds.gohtml index 1d7077b..1627d8c 100644 --- a/templates/pages/feeds.gohtml +++ b/templates/pages/feeds.gohtml @@ -6,4 +6,4 @@

-
{{ end }} +{{ end }}