fix(client): wrap axobservers in an option to avoid deser crashes

This commit fixes a crash for subscribers who try to deserialize state
from notifications. Even though skip_deserializing is used on the
AccessibilityObserver, we still need a sane Default, so we wrap the
inner AXObserver in an Option and default to None.
This commit is contained in:
LGUG2Z committed 2025-09-30 13:03:40 -07:00
1 parent ded36d39ee
commit 230acf3547
5 files changed
+29 -9

No files matched your search

+21
View File
@@ -21,6 +21,7 @@ use std::io::BufReader;
use std::io::Read;
use std::io::Write;
use std::net::Shutdown;
use std::os::unix::net::UnixListener;
use std::os::unix::net::UnixStream;
use std::time::Duration;
@@ -65,3 +66,23 @@ pub fn send_query(message: &SocketMessage) -> std::io::Result<String> {
Ok(response)
}
pub fn subscribe(name: &str) -> std::io::Result<UnixListener> {
let socket = DATA_DIR.join(name);
match std::fs::remove_file(&socket) {
Ok(()) => {}
Err(error) => match error.kind() {
std::io::ErrorKind::NotFound => {}
_ => {
return Err(error);
}
},
};
let listener = UnixListener::bind(&socket)?;
send_message(&SocketMessage::AddSubscriberSocket(name.to_string()))?;
Ok(listener)
}
+2 -2
View File
@@ -107,10 +107,10 @@ impl Application {
Ok(Self {
element: AccessibilityUiElement(AccessibilityApi::create_application(process_id)),
process_id,
observer: AccessibilityObserver(AccessibilityApi::create_observer(
observer: AccessibilityObserver(Some(AccessibilityApi::create_observer(
process_id,
Some(application_observer_callback),
)?),
)?)),
is_observable: true,
})
}
+2 -2
View File
@@ -94,10 +94,10 @@ impl Border {
monitor_idx: Option<usize>,
run_loop: CoreFoundationRunLoop,
) -> eyre::Result<Box<Self>> {
let observer = AccessibilityObserver(AccessibilityApi::create_observer(
let observer = AccessibilityObserver(Some(AccessibilityApi::create_observer(
process_id,
Some(border_observer_callback),
)?);
)?));
let rect = MacosApi::window_rect(&element).unwrap_or_default();
+3 -4
View File
@@ -1,6 +1,5 @@
#![warn(clippy::all)]
use crate::accessibility::AccessibilityApi;
use crate::accessibility::error::AccessibilityError;
use crate::core::ApplicationIdentifier;
use crate::core::SocketMessage;
@@ -261,20 +260,20 @@ impl Default for AccessibilityUiElement {
}
#[derive(Debug, Clone, PartialEq)]
pub struct AccessibilityObserver(pub CFRetained<AXObserver>);
pub struct AccessibilityObserver(pub Option<CFRetained<AXObserver>>);
unsafe impl Sync for AccessibilityObserver {}
unsafe impl Send for AccessibilityObserver {}
impl Deref for AccessibilityObserver {
type Target = AXObserver;
fn deref(&self) -> &Self::Target {
self.0.as_ref()
self.0.as_ref().expect("must have an AXObserver")
}
}
impl Default for AccessibilityObserver {
fn default() -> Self {
Self(AccessibilityApi::create_observer(1, None).unwrap())
Self(None)
}
}
+1 -1
View File
@@ -330,7 +330,7 @@ impl Window {
id: AccessibilityApi::window_id(&element)?,
element: AccessibilityUiElement(element),
application,
observer: AccessibilityObserver(observer),
observer: AccessibilityObserver(Some(observer)),
})
}