Repository navigation
Commit 52c4c08
fix(sidebar): converge stale-at-open state across devices (sections/sort/stars/mutes) (#7805)
Adds bounded-backoff recovery reads to all four sidebar sync hooks
(sections, sort, stars and mutes). A stale relay read at app open now
converges without a user edit or a reconnect.
## What this does
**Shared recovery hook (`useStaleReaderRecovery`).** All four hooks use
one retry effect. It reads immediately on mount, then at 5, 10, 30 and
60 s, staying at 60 s after that. A change of `visibilityState` to
`visible` triggers an immediate read. Reads are single-flight. The
effect restarts whenever `pubkey` or `relayUrl` changes, so a hook that
stays mounted while switching relays drops the old relay's in-flight
reads.
**Guards that stop a recovery read from rolling back a local edit:**
1. **Skip the read while an edit is pending.** If an edit is pending
when a tick starts, the tick skips its read and just schedules the next
one. Without this, the read could return the pre-edit blob after the
edit published and pending cleared. At that point neither apply-time
guard could reject it.
2. **Pending check inside the state updater.** `hasPending()` and the
effect lifetime are re-read inside `setStore(prev => ...)`. That way the
check runs when React executes the updater, not when the response
arrives.
3. **Local-mutation revision.** Each hook counts its local edits. The
count is snapshotted when a read starts and checked again at apply time.
If an edit landed while the read was in flight, the response is
discarded.
4. **Head advanced only after a successful cache write.** A failed
`write*Store()` leaves the same head retryable on the next tick.
**Ownership-aware pending clear.** Each sync manager's
`doPublish(store)` now clears `pendingStore` only while it still holds
that same `store`, on both the identical-payload early return and the
success path. Before, an older publish that finished after a newer edit
had replaced `pendingStore` wiped the newer edit's pending marker, so a
recovery read before the newer debounce could apply the older relay head
over it. `destroy()` still clears unconditionally.
## Scope
Reader-side recovery plus the ownership-aware pending clear. No
outboxes, arbitration or replay changes. It applies to
`useChannelSections`, `useChannelSortPreference`, `useChannelStars` and
`useChannelMutes`.
Related: [#7806](#7806)
---------
Signed-off-by: Will Pfleger <[email protected]>
Signed-off-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
Co-authored-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>1 parent f7ff429 commit 52c4c08
29 files changed
Lines changed: 2749 additions & 2280 deletions
File tree
- desktop
- src
- features/sidebar
- lib
- ui
- tests/e2e
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
49 | 54 | | |
50 | 55 | | |
51 | 56 | | |
| |||
71 | 76 | | |
72 | 77 | | |
73 | 78 | | |
| 79 | + | |
74 | 80 | | |
75 | 81 | | |
76 | 82 | | |
| |||
87 | 93 | | |
88 | 94 | | |
89 | 95 | | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
90 | 112 | | |
91 | 113 | | |
92 | 114 | | |
| |||
127 | 149 | | |
128 | 150 | | |
129 | 151 | | |
130 | | - | |
| 152 | + | |
| 153 | + | |
131 | 154 | | |
132 | 155 | | |
133 | 156 | | |
134 | 157 | | |
135 | 158 | | |
136 | | - | |
137 | | - | |
138 | | - | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
139 | 163 | | |
140 | 164 | | |
141 | 165 | | |
142 | | - | |
| 166 | + | |
143 | 167 | | |
144 | 168 | | |
145 | 169 | | |
| |||
152 | 176 | | |
153 | 177 | | |
154 | 178 | | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
155 | 190 | | |
156 | | - | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
157 | 196 | | |
158 | 197 | | |
159 | 198 | | |
160 | | - | |
161 | | - | |
162 | | - | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
163 | 202 | | |
164 | 203 | | |
165 | 204 | | |
| |||
180 | 219 | | |
181 | 220 | | |
182 | 221 | | |
183 | | - | |
| 222 | + | |
184 | 223 | | |
185 | 224 | | |
186 | 225 | | |
187 | 226 | | |
| 227 | + | |
188 | 228 | | |
189 | 229 | | |
190 | 230 | | |
191 | | - | |
| 231 | + | |
192 | 232 | | |
193 | 233 | | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
194 | 237 | | |
195 | 238 | | |
196 | 239 | | |
| |||
210 | 253 | | |
211 | 254 | | |
212 | 255 | | |
213 | | - | |
| 256 | + | |
| 257 | + | |
214 | 258 | | |
215 | 259 | | |
216 | 260 | | |
| |||
229 | 273 | | |
230 | 274 | | |
231 | 275 | | |
232 | | - | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
233 | 280 | | |
234 | 281 | | |
235 | 282 | | |
| |||
This file was deleted.
This file was deleted.
0 commit comments