forked from 1b-agent/opencadstudio-upstream
#249 — plugin XDATA written via write_record survived only in memory: the acadrust DWG writer dropped ExtendedData::records on save. Bump acadrust to e88a9a6 (records now encode to EED and decode back on read) and fix the host side that fed it: - ensure_app_id allocates a real APPID handle; a null handle serializes as 0 and the EED reference can't resolve, so the XDATA vanished on reopen. - write_record / remove_record drop stale raw_dwg_eed for the target app so an edit made after a save/reopen wins over the pre-edit bytes. #250 — out-of-process plugins got a throwaway document_mut() snapshot, so edits to existing entities were silently discarded and deletion wasn't expressible at all. Add the missing mutation surface: - UpdateEntity / RemoveEntity IPC requests + HostApi::update_entity / remove_entity (default in-process impls, RPC overrides on the client that invalidate the stale document cache). - Scene::update_entity replaces the entity in place, preserving its handle and owning block, and reseeds only its derived caches; remove reuses the cache-coherent erase_entities (which also honours layer locks). - document_mut() is documented as a local-only snapshot out-of-process. Co-Authored-By: Claude Opus 4.8 <[email protected]>
163 lines
4.5 KiB
Rust
163 lines
4.5 KiB
Rust
//! Request/response envelopes exchanged between the host and a plugin process.
|
|
//!
|
|
//! A single bidirectional socket is used. Each side sends either a request
|
|
//! (expecting a response) or a response (to a previous request). This lets the
|
|
//! host handle plugin RPCs inline while it waits for the result of a host→plugin
|
|
//! request such as `Dispatch`, avoiding the need for two sockets or threads.
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use crate::host::CommandStep;
|
|
use crate::manifest::ApiVersion;
|
|
use crate::ribbon::owned::{OwnedPluginManifest, OwnedRibbonGroup};
|
|
|
|
pub use acadrust::xdata::ExtendedDataRecord;
|
|
pub use acadrust::{CadDocument, EntityType, Handle};
|
|
|
|
/// Events the host forwards to an active plugin `InteractiveCommand`.
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub enum InteractiveEvent {
|
|
Point([f64; 3]),
|
|
Enter,
|
|
ObjectPick { handle: Handle, pt: [f64; 3] },
|
|
}
|
|
|
|
/// Initial handshake sent by the plugin runner immediately after connecting.
|
|
///
|
|
/// The runner proves it was spawned by this host by presenting a pre-shared
|
|
/// token delivered through the `OCS_PLUGIN_TOKEN` environment variable. A
|
|
/// mismatch causes the host to close the connection.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum RunnerHandshake {
|
|
Token(String),
|
|
}
|
|
|
|
/// Environment variable through which the host passes the pre-shared
|
|
/// authentication token to the plugin runner child process.
|
|
pub const PLUGIN_TOKEN_ENV: &str = "OCS_PLUGIN_TOKEN";
|
|
|
|
/// Requests the host sends to the plugin runner.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum HostRequest {
|
|
GetManifest,
|
|
GetRibbon,
|
|
Dispatch {
|
|
cmd: String,
|
|
},
|
|
InteractiveEvent {
|
|
command_id: u64,
|
|
event: InteractiveEvent,
|
|
},
|
|
GetPrompt {
|
|
command_id: u64,
|
|
},
|
|
NeedsEntityPick {
|
|
command_id: u64,
|
|
},
|
|
Shutdown,
|
|
}
|
|
|
|
/// Responses the plugin runner sends back for `HostRequest`.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum HostResponse {
|
|
Bool(bool),
|
|
CommandStep(CommandStep),
|
|
Text(String),
|
|
Ribbon(Vec<OwnedRibbonGroup>),
|
|
Manifest(OwnedPluginManifest),
|
|
Error(String),
|
|
}
|
|
|
|
/// Requests the plugin runner sends to the host.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum PluginRequest {
|
|
PushInfo(String),
|
|
PushOutput(String),
|
|
PushError(String),
|
|
AddEntity(EntityType),
|
|
/// Replace the existing entity carrying this entity's handle in place.
|
|
UpdateEntity(EntityType),
|
|
/// Delete the entity with `handle`.
|
|
RemoveEntity {
|
|
handle: Handle,
|
|
},
|
|
BumpGeometry,
|
|
ReadRecord {
|
|
handle: Handle,
|
|
app_name: String,
|
|
},
|
|
WriteRecord {
|
|
handle: Handle,
|
|
record: ExtendedDataRecord,
|
|
},
|
|
RemoveRecord {
|
|
handle: Handle,
|
|
app_name: String,
|
|
},
|
|
PushUndo {
|
|
label: String,
|
|
},
|
|
SetDirty,
|
|
StartInteractive {
|
|
command_id: u64,
|
|
},
|
|
DocumentSnapshot,
|
|
/// Ask the host to create/refresh a shared-memory document view and return
|
|
/// the file path + current version.
|
|
OpenDocumentView,
|
|
}
|
|
|
|
/// Responses the host sends back for `PluginRequest`.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum PluginResponse {
|
|
Ok,
|
|
Bool(bool),
|
|
Handle(Handle),
|
|
Record(Option<ExtendedDataRecord>),
|
|
Document(CadDocument),
|
|
Error(String),
|
|
/// Path to the memory-mapped file and the current snapshot version.
|
|
DocumentView {
|
|
path: String,
|
|
version: u64,
|
|
},
|
|
}
|
|
|
|
/// Messages sent from the host to the plugin runner.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum HostToPlugin {
|
|
Request(HostRequest),
|
|
Response(PluginResponse),
|
|
}
|
|
|
|
/// Messages sent from the plugin runner to the host.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
pub enum PluginToHost {
|
|
Request(PluginRequest),
|
|
Response(HostResponse),
|
|
}
|
|
|
|
/// Convenience helper for manifest serialization.
|
|
impl From<&'static crate::manifest::PluginManifest> for OwnedPluginManifest {
|
|
fn from(m: &'static crate::manifest::PluginManifest) -> Self {
|
|
Self {
|
|
id: m.id.to_string(),
|
|
name: m.name.to_string(),
|
|
version: m.version.to_string(),
|
|
description: m.description.to_string(),
|
|
api_version: m.api_version.major,
|
|
ribbon_order: m.ribbon_order,
|
|
xdata_apps: m.xdata_apps.iter().map(|s| s.to_string()).collect(),
|
|
command_prefixes: m.command_prefixes.iter().map(|s| s.to_string()).collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl OwnedPluginManifest {
|
|
pub fn api_version(&self) -> ApiVersion {
|
|
ApiVersion {
|
|
major: self.api_version,
|
|
}
|
|
}
|
|
}
|