github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 14:00:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Rename websocket recheck param to check-access

Browse Source 
Rename the zero-arg permission check from `authorized?` to
`check-access` in `still-authorized?` and `start-relay`, so the
call `(still-authorized? check-access)` reads as running a check
instead of passing a predicate to a predicate. No behavior change:
`?` stays only on the safe yes/no answer.

AI-assisted-by: muse-spark-1.3-contributor
This commit is contained in:
Andrey Antukh 2026-10-08 09:38:41 +00:00
parent 1f96cd2e4c
commit 97193da78e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.serena/memories/backend/websocket-subscriptions.md
View File

@ -28,7 +28,7 @@ Which mutations announce: `delete-team-member`, `leave-team`, `update-team-membe
- `take!` is the proven relay path here. `msgbus.clj` does use `sp/alts!` over data channels in production, so there is no general defect — but the relay keeps the simple blocking take plus an independent scheduled task instead.
- `ct/diff a b` returns **b − a** (`Duration/between`), so "time until a future instant" is `(inst-ms (ct/diff (ct/now) future))`.
- `ct/duration` unit keywords are singular: `{:millis 150}`, `{:minutes 5}`, never `:milliseconds`/`:days`.
- `still-authorized?` takes the predicate itself: `(boolean (authorized?))`. Calling `(boolean pred)` on the closure is always true and silently disables the interval — this exact bug shipped once and no test caught it until the resubscribe-counting test existed.
- `still-authorized?` takes the check itself: `(boolean (check-access))`. Calling `(boolean pred)` on the closure is always true and silently disables the interval — this exact bug shipped once and no test caught it until the resubscribe-counting test existed. Naming rule here: no `?` for the action that queries and can fail (`check-access`), `?` only for the safe yes/no answer (`still-authorized?`).
## Tests

12
backend/src/app/http/websocket.clj
View File

@ -162,7 +162,7 @@
(cf/get :subscription-revalidation-interval default-revalidation-interval))
(defn- still-authorized?
"Runs the `authorized?` permission predicate, reporting instead of
"Runs the `check-access` permission check, reporting instead of
throwing when the lookup itself fails.
A transient database error must not close a subscription that is still
@ -170,9 +170,9 @@
that fail open, deliberately: the announcement path (`watch-revocations`
below) also logs and moves on when a re-check throws. An interrupt is
not a lookup failure and is rethrown."
[authorized?]
[check-access]
(try
(boolean (authorized?))
(boolean (check-access))
(catch InterruptedException cause
(throw cause))
(catch Throwable cause
@ -241,17 +241,17 @@
(defn- start-relay
"Forwards `channel` into the client output channel of `wsp`, and keeps
a re-check of `authorized?` running on the interval. When access no
a re-check of `check-access` running on the interval. When access no
longer holds, `close!` tears the subscription down, which closes the
channel and ends the loop.
`on-forward` runs for every forwarded message, which is how the file
relay announces presence."
[{:keys [::ws/output-ch] :as wsp} channel authorized? close! on-forward]
[{:keys [::ws/output-ch] :as wsp} channel check-access close! on-forward]
(schedule-revalidation #(not (sp/closed? channel))
(inst-ms (revalidation-interval))
(fn []
(when-not (still-authorized? authorized?)
(when-not (still-authorized? check-access)
(l/info :hint
"closing websocket subscription on re-check"
:profile-id (::profile-id wsp))