1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

style: apply cargo fmt across workspace

Browse Source
This commit is contained in:
Karim Jerbi committed 2026-10-11 03:14:29 +01:00
1 parent 85710e5454
commit 9cf9ff2c5c
531 files changed
+57740 -33906
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/ocs_plugin_api/src/process/manager.rs
+1 -5
View File
@@ -97,11 +97,7 @@ impl PluginManager {
/// Fan out a host notification to every alive V4 plugin. Per-process errors
/// are logged; this is best-effort.
pub fn broadcast_notification(
&self,
command_id: Option<u64>,
notification: HostNotification,
) {
pub fn broadcast_notification(&self, command_id: Option<u64>, notification: HostNotification) {
for p in &self.plugins {
if !p.process.is_alive() {
continue;
crates/ocs_plugin_api/src/process/v4.rs
+106 -52
View File
@@ -145,12 +145,7 @@ impl V4Connection {
payload,
}) => {
if tab_id.is_none_or(|request_tab| request_tab == host.tab_id()) {
self.respond_to_plugin_request(
host,
rid,
payload,
on_start_interactive,
)?;
self.respond_to_plugin_request(host, rid, payload, on_start_interactive)?;
} else {
self.deferred
.lock()
@@ -167,9 +162,7 @@ impl V4Connection {
}
Err(mpsc::RecvTimeoutError::Disconnected) => {
self.shared.alive.store(false, Ordering::SeqCst);
return Err(PluginError::Runner(
"V4 reader thread disconnected".into(),
));
return Err(PluginError::Runner("V4 reader thread disconnected".into()));
}
}
}
@@ -217,12 +210,7 @@ impl V4Connection {
payload,
}) => {
if tab_id.is_none_or(|request_tab| request_tab == current_tab_id) {
self.respond_to_plugin_request(
host,
id,
payload,
on_start_interactive,
)?;
self.respond_to_plugin_request(host, id, payload, on_start_interactive)?;
} else {
self.deferred
.lock()
@@ -238,9 +226,7 @@ impl V4Connection {
Err(mpsc::TryRecvError::Empty) => return Ok(()),
Err(mpsc::TryRecvError::Disconnected) => {
self.shared.alive.store(false, Ordering::SeqCst);
return Err(PluginError::Runner(
"V4 reader thread disconnected".into(),
));
return Err(PluginError::Runner("V4 reader thread disconnected".into()));
}
}
}
@@ -324,7 +310,11 @@ impl V4Connection {
while self.shared.alive.load(Ordering::SeqCst) && Instant::now() < deadline {
std::thread::sleep(Duration::from_millis(10));
}
let _ = self.reader_handle.lock().unwrap_or_else(|e| e.into_inner()).take();
let _ = self
.reader_handle
.lock()
.unwrap_or_else(|e| e.into_inner())
.take();
}
}
@@ -442,20 +432,23 @@ mod tests {
label: &str,
entities: Vec<codec::EntityType>,
) -> Result<(), String> {
self.transactions.lock().unwrap().push((label.to_owned(), entities));
self.transactions
.lock()
.unwrap()
.push((label.to_owned(), entities));
Ok(())
}
fn set_dirty(&mut self) {}
fn push_info(&mut self, msg: &str) {
self.push_info_messages.lock().unwrap().push(msg.to_string());
self.push_info_messages
.lock()
.unwrap()
.push(msg.to_string());
}
fn push_output(&mut self, _msg: &str) {}
fn push_error(&mut self, _msg: &str) {}
fn start_interactive(&mut self, _command: Box<dyn crate::host::InteractiveCommand>) {}
fn plugin_state_any(
&self,
_plugin_id: &str,
) -> Option<&(dyn std::any::Any + Send + Sync)> {
fn plugin_state_any(&self, _plugin_id: &str) -> Option<&(dyn std::any::Any + Send + Sync)> {
None
}
fn plugin_state_any_mut(
@@ -537,7 +530,10 @@ mod tests {
// Read the host's V4 request and respond.
let req = recv::<HostToPluginV4>(&mut runner_stream).unwrap();
match req {
HostToPluginV4::Request { id, payload: HostRequest::Dispatch { cmd } } => {
HostToPluginV4::Request {
id,
payload: HostRequest::Dispatch { cmd },
} => {
assert_eq!(cmd, "HELLO");
send(
&mut runner_stream,
@@ -554,7 +550,13 @@ mod tests {
let mut host = DummyHost::new();
let resp = conn
.call(&mut host, HostRequest::Dispatch { cmd: "HELLO".to_string() }, &mut |_| {})
.call(
&mut host,
HostRequest::Dispatch {
cmd: "HELLO".to_string(),
},
&mut |_| {},
)
.unwrap();
assert!(matches!(resp, HostResponse::Bool(true)));
runner.join().unwrap();
@@ -573,7 +575,10 @@ mod tests {
let runner = thread::spawn(move || {
let req = recv::<HostToPluginV4>(&mut runner_stream).unwrap();
match req {
HostToPluginV4::Request { id, payload: HostRequest::Dispatch { .. } } => {
HostToPluginV4::Request {
id,
payload: HostRequest::Dispatch { .. },
} => {
// Send a nested plugin request.
send(
&mut runner_stream,
@@ -587,8 +592,10 @@ mod tests {
// Read the response to the nested request.
let resp = recv::<HostToPluginV4>(&mut runner_stream).unwrap();
match resp {
HostToPluginV4::Response { id: rid, payload: PluginResponse::Ok }
if rid == 99 => {}
HostToPluginV4::Response {
id: rid,
payload: PluginResponse::Ok,
} if rid == 99 => {}
other => panic!("unexpected nested response: {other:?}"),
}
// Now respond to the original dispatch.
@@ -607,11 +614,21 @@ mod tests {
let mut host = DummyHost::new();
let resp = conn
.call(&mut host, HostRequest::Dispatch { cmd: "NESTED".to_string() }, &mut |_| {})
.call(
&mut host,
HostRequest::Dispatch {
cmd: "NESTED".to_string(),
},
&mut |_| {},
)
.unwrap();
assert!(matches!(resp, HostResponse::Bool(true)));
let infos = host.take_push_info();
assert_eq!(infos, vec!["nested".to_string()], "push_info should be delivered to host");
assert_eq!(
infos,
vec!["nested".to_string()],
"push_info should be delivered to host"
);
runner.join().unwrap();
restore_test_env();
}
@@ -632,29 +649,56 @@ mod tests {
let runner = thread::spawn(move || {
let req = recv::<HostToPluginV4>(&mut runner_stream).unwrap();
let HostToPluginV4::Request { id, payload: HostRequest::Dispatch { .. } } = req else {
let HostToPluginV4::Request {
id,
payload: HostRequest::Dispatch { .. },
} = req
else {
panic!("unexpected host request: {req:?}");
};
send(&mut runner_stream, &PluginToHostV4::Request {
id: 99,
tab_id: Some(0),
payload: PluginRequest::UpdateEntitiesTransaction {
label: "Move point".into(),
entities: vec![sent],
send(
&mut runner_stream,
&PluginToHostV4::Request {
id: 99,
tab_id: Some(0),
payload: PluginRequest::UpdateEntitiesTransaction {
label: "Move point".into(),
entities: vec![sent],
},
},
}).unwrap();
assert!(matches!(recv::<HostToPluginV4>(&mut runner_stream).unwrap(),
HostToPluginV4::Response { id: 99, payload: PluginResponse::EntityTransactionResult(Ok(())) }));
send(&mut runner_stream, &PluginToHostV4::Response {
id,
payload: HostResponse::Bool(true),
}).unwrap();
)
.unwrap();
assert!(matches!(
recv::<HostToPluginV4>(&mut runner_stream).unwrap(),
HostToPluginV4::Response {
id: 99,
payload: PluginResponse::EntityTransactionResult(Ok(()))
}
));
send(
&mut runner_stream,
&PluginToHostV4::Response {
id,
payload: HostResponse::Bool(true),
},
)
.unwrap();
});
let mut host = DummyHost::new();
assert!(matches!(conn.call(&mut host, HostRequest::Dispatch { cmd: "MOVE".into() }, &mut |_| {}).unwrap(),
HostResponse::Bool(true)));
assert_eq!(host.take_transactions(), vec![("Move point".into(), vec![expected])]);
assert!(matches!(
conn.call(
&mut host,
HostRequest::Dispatch { cmd: "MOVE".into() },
&mut |_| {}
)
.unwrap(),
HostResponse::Bool(true)
));
assert_eq!(
host.take_transactions(),
vec![("Move point".into(), vec![expected])]
);
runner.join().unwrap();
restore_test_env();
}
@@ -735,7 +779,11 @@ mod tests {
std::thread::sleep(Duration::from_millis(200));
let got = received.lock().unwrap().clone();
assert_eq!(got.len(), 1, "second notification should survive handler panic");
assert_eq!(
got.len(),
1,
"second notification should survive handler panic"
);
assert_eq!(got[0].0, Some(1));
runner.join().unwrap();
drop(conn);
@@ -783,7 +831,10 @@ mod tests {
count <= 3,
"rate limiter should drop most notifications, got {count}"
);
assert!(conn.is_alive(), "connection should survive rate-limited flood");
assert!(
conn.is_alive(),
"connection should survive rate-limited flood"
);
runner.join().unwrap();
drop(conn);
std::env::remove_var("OCS_PLUGIN_NOTIFY_RATE_LIMIT");
@@ -816,7 +867,10 @@ mod tests {
assert_eq!(command_id, 1);
assert_eq!(source, CommandSource::Editor);
assert_eq!(code, "1+1");
assert_eq!(tab_index, 0, "ExecuteCode should be tied to the host's tab index");
assert_eq!(
tab_index, 0,
"ExecuteCode should be tied to the host's tab index"
);
thread::sleep(Duration::from_millis(100));
send(
&mut runner_stream,