fix: reduce daemon idle polling and memory use

Author: radislabus-star

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lay"
-version = "0.1.219"
+version = "0.1.220"
 edition = "2021"
 description = "Alpha Double Shift RU/EN layout rescue for Linux desktops"
 license = "MIT"

Cargo.toml

@@ -44,6 +44,15 @@ curl -fsSL https://raw.githubusercontent.com/radislabus-star/lay-public/main/scr
 По умолчанию double Shift исправляет **1 последнее слово**. Области `2 слова`
 и `3 слова` можно включить отдельно в трее.
 
+## Что нового в 0.1.220
+
+- исправлен idle busy-loop в non-GNOME backend: `lay-daemon` больше не
+  зацикливает `poll()` на 1 мс из-за stale focus-poll timestamp;
+- настройки демона кешируются по `mtime` с коротким интервалом проверки, чтобы
+  горячий путь не читал `~/.config/lay/config.json` на каждом цикле;
+- русские горячие словари упакованы компактнее: текущая память свежего демона
+  снизилась примерно со 168 МБ до 139 МБ после прогрева.
+
 ## Что нового в 0.1.219
 
 - исправлен Niri/backend-кейс без `focused_window_identity`: при смене

README.md

@@ -13,7 +13,7 @@ number from `git rev-list`.
 
 Current publication branch version:
 
-- `0.1.219`
+- `0.1.220`
 
 Do not rely on commit counts. Before publishing or pushing, run the bump script
 or verify the version fields manually.

VERSIONING.md

@@ -1,8 +1,8 @@
 {
     "uuid": "lay@radislabus-star.github.io",
     "name": "Lay Layout Switcher",
-    "version": 219,
-    "version-name": "0.1.219",
+    "version": 220,
+    "version-name": "0.1.220",
     "description": "Alpha GNOME Shell extension для lay-daemon. Показывает EN/RU в трее, переключает раскладку по клику. Минимальный DBus bridge для layout activation и fallback text insert.",
     "shell-version": ["45", "46", "47", "50"],
     "url": "https://github.com/radislabus-star/lay-public"

extension/lay@radislabus-star.github.io/metadata.json

@@ -6,8 +6,8 @@ import Gtk from 'gi://Gtk';
 import {ExtensionPreferences} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
 
 const CONFIG_PATH = GLib.get_home_dir() + '/.config/lay/config.json';
-const APP_VERSION = '0.1.219';
-const APP_RELEASE_DATE = '2026-06-07';
+const APP_VERSION = '0.1.220';
+const APP_RELEASE_DATE = '2026-06-11';
 const APP_URL = 'https://github.com/radislabus-star/lay-public';
 const APP_ICON_NAME = 'input-keyboard-symbolic';
 const HEADER_ICON_SIZE = 16;

extension/lay@radislabus-star.github.io/prefs.js

@@ -4,8 +4,8 @@ import GLib from 'gi://GLib';
 import Gtk from 'gi://Gtk';
 
 const CONFIG_PATH = GLib.get_home_dir() + '/.config/lay/config.json';
-const APP_VERSION = '0.1.219';
-const APP_RELEASE_DATE = '2026-06-07';
+const APP_VERSION = '0.1.220';
+const APP_RELEASE_DATE = '2026-06-11';
 const APP_URL = 'https://github.com/radislabus-star/lay-public';
 const APP_ICON_NAME = 'input-keyboard-symbolic';
 const HEADER_ICON_SIZE = 16;

extension/lay@radislabus-star.github.io/settings.js

@@ -6,9 +6,9 @@ export const STATS_PATH = GLib.get_home_dir() + '/.local/share/lay/stats.json';
 export const RECENT_ACTIONS_PATH = GLib.get_home_dir() + '/.local/share/lay/recent_actions.jsonl';
 export const PROJECT_DIR = GLib.get_home_dir() + '/projects/lay';
 export const UPDATE_LOG_PATH = GLib.get_home_dir() + '/.local/state/lay/update.log';
-export const APP_VERSION = '0.1.219';
+export const APP_VERSION = '0.1.220';
 export const APP_DESCRIPTION = 'Альфа: RU/EN-переключатель по двойному Shift и помощь при наборе';
-export const APP_RELEASE_DATE = '2026-06-07';
+export const APP_RELEASE_DATE = '2026-06-11';
 export const APP_LICENSE = 'MIT';
 export const APP_URL = 'https://github.com/radislabus-star/lay-public';
 export const APP_PLATFORM = 'Linux: GNOME, KDE, Niri, Wayland, X11';

extension/lay@radislabus-star.github.io/tray_support.js

@@ -1,26 +1,89 @@
 use lay::config::{CorrectionEngine, LayConfig};
 use lay::desktop::LayoutBackend;
 use lay::text_backend::TextBackendPreference;
+#[cfg(not(test))]
+use std::path::PathBuf;
+#[cfg(not(test))]
+use std::sync::Mutex;
 use std::sync::OnceLock;
+#[cfg(not(test))]
+use std::time::{Duration, Instant, SystemTime};
 
 use super::{detect_auto_layout_backend_hint, ENTER_AUTOCORRECT_EXPERIMENT_ENV};
 
 static AUTO_LAYOUT_BACKEND_HINT: OnceLock<Option<LayoutBackend>> = OnceLock::new();
 
+#[cfg(not(test))]
+const CONFIG_CACHE_CHECK_INTERVAL: Duration = Duration::from_millis(250);
+
+#[cfg(not(test))]
+struct CachedLayConfig {
+    config: LayConfig,
+    modified: Option<SystemTime>,
+    checked_at: Instant,
+}
+
+#[cfg(not(test))]
+static CONFIG_CACHE: OnceLock<Mutex<CachedLayConfig>> = OnceLock::new();
+
+fn current_config() -> LayConfig {
+    #[cfg(test)]
+    {
+        LayConfig::load()
+    }
+    #[cfg(not(test))]
+    {
+        let cache = CONFIG_CACHE.get_or_init(|| {
+            Mutex::new(CachedLayConfig {
+                config: LayConfig::load(),
+                modified: config_modified_at(),
+                checked_at: Instant::now(),
+            })
+        });
+        let mut cache = cache
+            .lock()
+            .unwrap_or_else(|poisoned| poisoned.into_inner());
+        if cache.checked_at.elapsed() < CONFIG_CACHE_CHECK_INTERVAL {
+            return cache.config.clone();
+        }
+
+        cache.checked_at = Instant::now();
+        let modified = config_modified_at();
+        if modified != cache.modified {
+            cache.config = LayConfig::load();
+            cache.modified = modified;
+        }
+        cache.config.clone()
+    }
+}
+
+#[cfg(not(test))]
+fn config_modified_at() -> Option<SystemTime> {
+    std::fs::metadata(config_path())
+        .and_then(|metadata| metadata.modified())
+        .ok()
+}
+
+#[cfg(not(test))]
+fn config_path() -> PathBuf {
+    let home = std::env::var("HOME").unwrap_or_default();
+    PathBuf::from(home).join(lay::config::CONFIG_PATH)
+}
+
 pub(super) fn active_replace_words() -> usize {
-    LayConfig::load().active_replace_words()
+    current_config().active_replace_words()
 }
 
 pub(super) fn active_typing_assist_words() -> usize {
-    LayConfig::load().active_typing_assist_words()
+    current_config().active_typing_assist_words()
 }
 
 pub(super) fn active_correction_engine() -> CorrectionEngine {
-    LayConfig::load().active_correction_engine()
+    current_config().active_correction_engine()
 }
 
 pub(super) fn active_layout_backend() -> LayoutBackend {
-    let config = LayConfig::load();
+    let config = current_config();
     let backend = config.active_layout_backend();
     let configured = config.layout_backend.trim().to_ascii_lowercase();
     if configured != "auto" {
@@ -34,19 +97,19 @@ pub(super) fn active_layout_backend() -> LayoutBackend {
 }
 
 pub(super) fn active_text_backend() -> TextBackendPreference {
-    LayConfig::load().active_text_backend()
+    current_config().active_text_backend()
 }
 
 pub(super) fn active_auto_replace() -> bool {
-    LayConfig::load().auto_replace
+    current_config().auto_replace
 }
 
 pub(super) fn active_typing_assist() -> bool {
-    LayConfig::load().typing_assist
+    current_config().typing_assist
 }
 
 pub(super) fn active_enter_autocorrect() -> bool {
-    let cfg = LayConfig::load();
+    let cfg = current_config();
     active_enter_autocorrect_from_env(
         cfg.enter_autocorrect,
         std::env::var(ENTER_AUTOCORRECT_EXPERIMENT_ENV)
@@ -73,22 +136,22 @@ pub(super) fn active_enter_autocorrect_from_env(
 }
 
 pub(super) fn active_auto_switch_layout() -> bool {
-    LayConfig::load().auto_switch_layout
+    current_config().auto_switch_layout
 }
 
 pub(super) fn active_learning_log() -> bool {
-    LayConfig::load().learning_log
+    current_config().learning_log
 }
 
 pub(super) fn active_lem_enabled_for_scope(word_count: usize) -> bool {
-    LayConfig::load().lem_enabled_for_scope(word_count)
+    current_config().lem_enabled_for_scope(word_count)
 }
 
 #[cfg(not(test))]
 pub(super) fn active_typing_assist_pipeline_for_auto_replace(
     context: &str,
 ) -> Vec<lay::config::TypingAssistRuleConfig> {
-    let cfg = LayConfig::load();
+    let cfg = current_config();
     lay::typing_context::typing_assist_pipeline_for_context(
         cfg.auto_replace,
         cfg.active_correction_safety(),

src/bin/lay_daemon/config_runtime.rs

@@ -51,10 +51,13 @@ fn poll_focused_window_state_after(
     last_poll: &mut Instant,
     min_interval: Duration,
 ) -> Option<FocusedWindowState> {
-    if active_layout_backend() != LayoutBackend::Gnome || last_poll.elapsed() < min_interval {
+    if last_poll.elapsed() < min_interval {
         return None;
     }
     *last_poll = Instant::now();
+    if active_layout_backend() != LayoutBackend::Gnome {
+        return None;
+    }
     focused_window_state()
 }