python-voiceio 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

{python_voiceio-0.9.1.dist-info → python_voiceio-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-voiceio
-Version: 0.9.1
+Version: 0.9.2
 Summary: Voice dictation for Linux. Speak → text, locally, instantly.
 Author: Hugo Montenegro
 License-Expression: MIT

{python_voiceio-0.9.1.dist-info → python_voiceio-0.9.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-python_voiceio-0.9.1.dist-info/licenses/LICENSE,sha256=Gz61o8jFTAvZUZyB3nWDB3DQQVuipjfPkVu9W8hBHM0,1072
-voiceio/__init__.py,sha256=UwJXM8JY2T3tE2id0K2k_lEaVThbRTrGO1mNibyzIz8,22
+python_voiceio-0.9.2.dist-info/licenses/LICENSE,sha256=Gz61o8jFTAvZUZyB3nWDB3DQQVuipjfPkVu9W8hBHM0,1072
+voiceio/__init__.py,sha256=gqT-BGoeEItda9fICQDvLbxEjWRIBhFJxPxxKvmHLUo,22
 voiceio/__main__.py,sha256=xT5QCGGreYMisHO7Lh_Y-xAQ2TOzG2D7npKknGNcWSY,53
 voiceio/app.py,sha256=ScrUVDQQ_YbAFKKSMOhaRPX_WTcPuenhnRdSzWMxThE,73785
 voiceio/audit.py,sha256=p4F2BBX4wEC9eS8MSplzfXL52XC2dyIKbgrRvR-WbTU,15802
@@ -45,8 +45,8 @@ voiceio/hotkeys/chain.py,sha256=8pvPhipmxWwmGG9DRXy8dlEKTPFILxNzYO-adcvw5Ps,2800
 voiceio/hotkeys/evdev.py,sha256=DHmd2IASBkYnyY5JEGFIoYfZtw3T9Ij6wKclkx-6m94,5109
 voiceio/hotkeys/pynput_backend.py,sha256=_rLb8p0JakR9T32LJclHVTch49M_mnB3UeUsI_IkfLk,3576
 voiceio/hotkeys/socket_backend.py,sha256=xLNFa8FvJbL5VLKqMRhKPeaKdhztYwxyVV_VOlG1PkM,3373
-voiceio/ibus/__init__.py,sha256=WZgQTPNnQZmmFurw3XPQEfV49nehmKoDI0wTg-WId1E,1120
-voiceio/ibus/engine.py,sha256=S_vepGH_6ZNZL1UBbgZZPhWbTkjrF9osVn5_Nf5utqI,9602
+voiceio/ibus/__init__.py,sha256=z_f9-svxKgMpNpnATGl7lkMskAMhW2WzJ1MretmUwgs,2534
+voiceio/ibus/engine.py,sha256=HF2rz3Jp51ljPqR3XP2iB2qpwfSKRV7Rbyj11zOiDrs,10015
 voiceio/ibus/pending.py,sha256=T6Y_8oimhabahunp9RogtO-OTA5aw9d9G4T5lH1WAL4,1464
 voiceio/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 voiceio/models/silero_vad.onnx,sha256=GhU6IvRQnikqlOZ9b5uF6N6yW0mIaCt-F0xlJ52HiOM,2327524
@@ -74,8 +74,8 @@ voiceio/typers/pynput_type.py,sha256=DTtkT59M-EKOAlTNkvcZrRvf_Fq52OpI8S5t_8S-QAY
 voiceio/typers/wtype.py,sha256=d1wG-HZdYDQxXIysV_Xvk9HixDpaJgl3VEoKbP5vhIs,1786
 voiceio/typers/xdotool.py,sha256=dh1zhPqUT8ihJahJ7ZKm6PtfYY087UAzADx664DvQOM,1356
 voiceio/typers/ydotool.py,sha256=dt0W9ot__W8LQG2so8vZLGIw9leK2Q6g3i-Voo0LXE4,5327
-python_voiceio-0.9.1.dist-info/METADATA,sha256=cl2iSSiUNTBYc_PLsGeyD5uZDE44RVYV81nsJkvfVuc,15877
-python_voiceio-0.9.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_voiceio-0.9.1.dist-info/entry_points.txt,sha256=U64fA65zxzyLoC8bgbn2ztQVWHLsc0o0H0qCk1J9DMc,218
-python_voiceio-0.9.1.dist-info/top_level.txt,sha256=piwtn309lD6uexQyXdZ-efAVBJF9y6Wfr48Z-8zkNhg,8
-python_voiceio-0.9.1.dist-info/RECORD,,
+python_voiceio-0.9.2.dist-info/METADATA,sha256=RZm3kWz94AUBzUicA4CWYbm_oLyaFrNVfvU0acqEHEY,15877
+python_voiceio-0.9.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_voiceio-0.9.2.dist-info/entry_points.txt,sha256=U64fA65zxzyLoC8bgbn2ztQVWHLsc0o0H0qCk1J9DMc,218
+python_voiceio-0.9.2.dist-info/top_level.txt,sha256=piwtn309lD6uexQyXdZ-efAVBJF9y6Wfr48Z-8zkNhg,8
+python_voiceio-0.9.2.dist-info/RECORD,,

voiceio/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.1"
+__version__ = "0.9.2"

voiceio/ibus/__init__.py

@@ -6,6 +6,37 @@ from pathlib import Path
 
 SOCKET_PATH = Path(os.environ.get("XDG_RUNTIME_DIR", "/tmp")) / "voiceio-ibus.sock"
 READY_PATH = Path(os.environ.get("XDG_RUNTIME_DIR", "/tmp")) / "voiceio-ibus.ready"
+# Held for the engine's lifetime so exactly one process ever owns the command
+# socket — see acquire_singleton_lock().
+LOCK_PATH = Path(os.environ.get("XDG_RUNTIME_DIR", "/tmp")) / "voiceio-ibus.lock"
+
+
+def acquire_singleton_lock() -> int | None:
+    """Take an exclusive, lifetime-held lock on LOCK_PATH.
+
+    Returns the open fd on success (the caller must keep it open — the lock is
+    released when the fd closes, i.e. when the process dies), or None if another
+    engine already holds it.
+
+    This is the race-free gate against duplicate engines. ibus-daemon
+    exec-spawns its own copy of the engine when something activates the voiceio
+    source (GNOME's per-window source memory / Super+Space — voiceio sits first
+    in mru-sources). A ping-then-bind check is check-then-act: two engines
+    starting close together both see "no healthy peer", then both unlink+rebind
+    the DGRAM socket in _socket_listener. The loser is left bound to an orphaned
+    inode — alive but never receiving pings ("zombie") — which the daemon's
+    health watchdog then kills and respawns, churning ~15x/day. flock is atomic:
+    the loser never touches the socket, it just exits.
+    """
+    import fcntl
+
+    fd = os.open(str(LOCK_PATH), os.O_CREAT | os.O_RDWR, 0o600)
+    try:
+        fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
+    except OSError:
+        os.close(fd)
+        return None
+    return fd
 
 
 def ping_engine(timeout: float = 2.0) -> bool:

voiceio/ibus/engine.py

@@ -24,10 +24,18 @@ import gi
 gi.require_version("IBus", "1.0")
 from gi.repository import GLib, GObject, IBus
 
-from voiceio.ibus import READY_PATH, SOCKET_PATH, ping_engine
+from voiceio.ibus import (
+    READY_PATH,
+    SOCKET_PATH,
+    acquire_singleton_lock,
+)
 from voiceio.ibus.pending import PendingBuffer
 
 log = logging.getLogger(__name__)
+
+# Singleton lock fd, held for the process lifetime (see main()). Module-level so
+# it is never garbage-collected — closing the fd would release the lock.
+_lock_fd: int | None = None
 ENGINE_NAME = "voiceio"
 COMPONENT_NAME = "org.voiceio.ibus"
 
@@ -230,13 +238,17 @@ def main() -> None:
         ],
     )
 
-    # Refuse to double-run. ibus-daemon can exec-spawn its own copy of this
-    # engine (component XML) when something activates the voiceio source —
-    # e.g. GNOME's per-window source memory. Binding SOCKET_PATH here would
-    # steal it from the healthy daemon-spawned engine and silently starve it
-    # (alive, but never sees another command or ping → zombie recovery).
-    if ping_engine(timeout=0.5):
-        log.info("Healthy VoiceIO engine already serving %s — exiting duplicate", SOCKET_PATH)
+    # Refuse to double-run, race-free. ibus-daemon exec-spawns its own copy of
+    # this engine (component XML) when something activates the voiceio source
+    # (GNOME per-window source memory / Super+Space — voiceio is first in
+    # mru-sources). Without an atomic gate, two engines both pass a ping check
+    # then both unlink+rebind SOCKET_PATH in _socket_listener; the loser is
+    # left on an orphaned inode — a "zombie" the watchdog kills and respawns.
+    # The lock fd is held for our whole lifetime (released on process death).
+    global _lock_fd
+    _lock_fd = acquire_singleton_lock()
+    if _lock_fd is None:
+        log.info("Another VoiceIO engine holds the lock — exiting duplicate")
         return
 
     IBus.init()