aboutsummaryrefslogtreecommitdiff
path: root/modules/signal-config.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-07-14 00:07:06 -0500
committerCraig Jennings <c@cjennings.net>2026-07-14 00:07:06 -0500
commit703b4841253ca610e9b50a8e8519863eaf22a6b2 (patch)
tree162e9cff886d7e8e6bdca41113dc245cee438d61 /modules/signal-config.el
parent03a1f26b2879f678a48c036a9e6f4b9ace864c3b (diff)
downloaddotemacs-703b4841253ca610e9b50a8e8519863eaf22a6b2.tar.gz
dotemacs-703b4841253ca610e9b50a8e8519863eaf22a6b2.zip
fix(signal): honor the cache-clear promise and mark empty fetches warm
Two picker-cache bugs from the config audit, verified against current code first. The cache docstring promised clearing on signel-stop, but nothing cleared it, so a stale contact list survived a relink or reconnect. I advised a named clear function :after signel-stop, which makes the docstring true. An empty listContacts result cached nil, indistinguishable from a cold cache, so a zero-contact account re-ran the picker's blocking fetch (up to the 3s timeout) on every open. The fetch now caches an empty sentinel and the picker reads through cj/signel--cached-contacts. One existing test pinned the nil behavior and now asserts the sentinel instead.
Diffstat (limited to 'modules/signal-config.el')
-rw-r--r--modules/signal-config.el34
1 files changed, 27 insertions, 7 deletions
diff --git a/modules/signal-config.el b/modules/signal-config.el
index edb7d0dc..2ee4403f 100644
--- a/modules/signal-config.el
+++ b/modules/signal-config.el
@@ -199,10 +199,27 @@ time."
(declare-function signel--send-rpc "signel" (method params &optional target-buffer success-callback))
(defvar cj/signel--contact-cache nil
- "Cached `(LABEL . RECIPIENT)' alist for the contact picker.
+ "Contact-picker cache: nil (cold), `empty', or a `(LABEL . RECIPIENT)' alist.
Populated by `cj/signel--fetch-contacts' on first invocation (or after a
-`cj/signel-refresh-contacts'), and cleared on `signel-stop' / restart so
-a stale list can't survive a reconnect. In-memory only.")
+`cj/signel-refresh-contacts'). A fetched-and-empty account caches the
+symbol `empty' rather than nil, so it reads as warm and the picker does
+not re-run its blocking fetch on every open -- read through
+`cj/signel--cached-contacts'. Cleared back to cold by
+`cj/signel--clear-contact-cache', advised onto `signel-stop' so a stale
+list can't survive a reconnect. In-memory only.")
+
+(defun cj/signel--clear-contact-cache (&rest _)
+ "Return the contact cache to cold (nil) so the next picker refetches.
+Advised `:after' `signel-stop': a relink or reconnect may change the
+contact list, so a cache from the previous connection must not survive."
+ (setq cj/signel--contact-cache nil))
+
+(advice-add 'signel-stop :after #'cj/signel--clear-contact-cache)
+
+(defun cj/signel--cached-contacts ()
+ "Return the cached contact alist, treating the `empty' sentinel as none."
+ (unless (eq cj/signel--contact-cache 'empty)
+ cj/signel--contact-cache))
(defcustom cj/signel-fetch-timeout 3.0
"Seconds the picker blocks on `accept-process-output' for a cold-cache fetch.
@@ -249,8 +266,10 @@ fires a void-variable error before the autoload would trigger."
Issues a `listContacts' RPC and registers a success callback that runs
the result through `cj/signal--parse-contacts' (the verified parser) and
stores the resulting `(LABEL . RECIPIENT)' alist in the cache. An empty
-result populates the cache as nil; a failure goes through the dispatch
-error path and never invokes the callback, so the prior cache survives.
+result caches the `empty' sentinel -- nil would read as a cold cache and
+re-run the picker's blocking fetch on every open. A failure goes
+through the dispatch error path and never invokes the callback, so the
+prior cache survives.
AFTER-CALLBACK, when non-nil, is invoked with no arguments after the
cache has been populated -- the picker uses this to unblock its
@@ -258,7 +277,8 @@ bounded-wait on cold caches."
(signel--send-rpc
"listContacts" nil nil
(lambda (result)
- (setq cj/signel--contact-cache (cj/signal--parse-contacts result))
+ (setq cj/signel--contact-cache
+ (or (cj/signal--parse-contacts result) 'empty))
(when after-callback (funcall after-callback)))))
(defun cj/signel-refresh-contacts ()
@@ -306,7 +326,7 @@ opens the chosen recipient in `signel-chat'."
"Signal contact fetch timed out after %.1fs; try again or run M-x cj/signel-refresh-contacts (see *signel-log* for detail)"
cj/signel-fetch-timeout))))
(let* ((note-self (cons "Note to Self" signel-account))
- (candidates (cons note-self cj/signel--contact-cache))
+ (candidates (cons note-self (cj/signel--cached-contacts)))
(table (lambda (string pred action)
(if (eq action 'metadata)
`(metadata