* wip * sketch a bit more; going to pull this out of tests next * wip * lock start things * this was a bad idea * Revert "this was a bad idea" This reverts commita2092e7ed6
. * prepare prelude before spawning * error * poop * yike * :( * ok * Reapply "this was a bad idea" This reverts commitfafdf41093
. * chip away more * man this is bad * fix rebase add feature flag Signed-off-by: Jess Frazelle <github@jessfraz.com> * get rid of execution kind Signed-off-by: Jess Frazelle <github@jessfraz.com> * clippy Signed-off-by: Jess Frazelle <github@jessfraz.com> * logs Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * no extra executes Signed-off-by: Jess Frazelle <github@jessfraz.com> * race w batch Signed-off-by: Jess Frazelle <github@jessfraz.com> * cluppy Signed-off-by: Jess Frazelle <github@jessfraz.com> * no printlns Signed-off-by: Jess Frazelle <github@jessfraz.com> * no printlns Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix source ranges Signed-off-by: Jess Frazelle <github@jessfraz.com> * batch shit Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix some bugs Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix error Signed-off-by: Jess Frazelle <github@jessfraz.com> * cut 1 * preserve mem * re-ad deep_clone the helper we were calling was pushing a new call, which was hanging out. we can skip the middleman since we already have something properly prepared, just without a stdlib in some cases. * skip non-kcl * clean up source range bug * error message changed the uuids also changed because the error is hit before execute even starts. * typo * rensnapshot a few * order things * MAYBE REVERT LATER: attempt at an ordering * snapsnap * Revert "snapsnap" This reverts commit7350b32c7d
. * Revert "MAYBE REVERT LATER:" This reverts commitab49f3e85f
. * ugh * poop * poop2 * lint * tranche 1 * more * more snaps * snap * more * update * MAYBE REVERT THIS * cache multi-file Signed-off-by: Jess Frazelle <github@jessfraz.com> * addd tests Signed-off-by: Jess Frazelle <github@jessfraz.com> * set to false Signed-off-by: Jess Frazelle <github@jessfraz.com> * add test outputs Signed-off-by: Jess Frazelle <github@jessfraz.com> * clippy Signed-off-by: Jess Frazelle <github@jessfraz.com> * kcl-py-bindings uses carwheel Signed-off-by: Jess Frazelle <github@jessfraz.com> * update snapshots Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Paul R. Tagliamonte <paul@zoo.dev> Co-authored-by: Paul Tagliamonte <paultag@gmail.com>
217 lines
7.6 KiB
Rust
217 lines
7.6 KiB
Rust
//! Functions for setting up our WebSocket and WebRTC connections for communications with the
|
|
//! engine.
|
|
use std::{collections::HashMap, sync::Arc};
|
|
|
|
use anyhow::Result;
|
|
use indexmap::IndexMap;
|
|
use kcmc::websocket::{WebSocketRequest, WebSocketResponse};
|
|
use kittycad_modeling_cmds as kcmc;
|
|
use tokio::sync::RwLock;
|
|
use uuid::Uuid;
|
|
use wasm_bindgen::prelude::*;
|
|
|
|
use crate::{
|
|
engine::EngineStats,
|
|
errors::{KclError, KclErrorDetails},
|
|
execution::{ArtifactCommand, DefaultPlanes, IdGenerator},
|
|
SourceRange,
|
|
};
|
|
|
|
#[wasm_bindgen(module = "/../../src/lang/std/engineConnection.ts")]
|
|
extern "C" {
|
|
#[derive(Debug, Clone)]
|
|
pub type EngineCommandManager;
|
|
|
|
#[wasm_bindgen(method, js_name = sendModelingCommandFromWasm, catch)]
|
|
fn send_modeling_cmd_from_wasm(
|
|
this: &EngineCommandManager,
|
|
id: String,
|
|
rangeStr: String,
|
|
cmdStr: String,
|
|
idToRangeStr: String,
|
|
) -> Result<js_sys::Promise, js_sys::Error>;
|
|
|
|
#[wasm_bindgen(method, js_name = startNewSession, catch)]
|
|
fn start_new_session(this: &EngineCommandManager) -> Result<js_sys::Promise, js_sys::Error>;
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct EngineConnection {
|
|
manager: Arc<EngineCommandManager>,
|
|
batch: Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>>,
|
|
batch_end: Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
|
|
responses: Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>>,
|
|
artifact_commands: Arc<RwLock<Vec<ArtifactCommand>>>,
|
|
/// The default planes for the scene.
|
|
default_planes: Arc<RwLock<Option<DefaultPlanes>>>,
|
|
stats: EngineStats,
|
|
}
|
|
|
|
// Safety: WebAssembly will only ever run in a single-threaded context.
|
|
unsafe impl Send for EngineConnection {}
|
|
unsafe impl Sync for EngineConnection {}
|
|
|
|
impl EngineConnection {
|
|
pub async fn new(manager: EngineCommandManager) -> Result<EngineConnection, JsValue> {
|
|
#[allow(clippy::arc_with_non_send_sync)]
|
|
Ok(EngineConnection {
|
|
manager: Arc::new(manager),
|
|
batch: Arc::new(RwLock::new(Vec::new())),
|
|
batch_end: Arc::new(RwLock::new(IndexMap::new())),
|
|
responses: Arc::new(RwLock::new(IndexMap::new())),
|
|
artifact_commands: Arc::new(RwLock::new(Vec::new())),
|
|
default_planes: Default::default(),
|
|
stats: Default::default(),
|
|
})
|
|
}
|
|
|
|
async fn do_send_modeling_cmd(
|
|
&self,
|
|
id: uuid::Uuid,
|
|
source_range: SourceRange,
|
|
cmd: WebSocketRequest,
|
|
id_to_source_range: HashMap<uuid::Uuid, SourceRange>,
|
|
) -> Result<WebSocketResponse, KclError> {
|
|
let source_range_str = serde_json::to_string(&source_range).map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: format!("Failed to serialize source range: {:?}", e),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
let cmd_str = serde_json::to_string(&cmd).map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: format!("Failed to serialize modeling command: {:?}", e),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
let id_to_source_range_str = serde_json::to_string(&id_to_source_range).map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: format!("Failed to serialize id to source range: {:?}", e),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
|
|
let promise = self
|
|
.manager
|
|
.send_modeling_cmd_from_wasm(id.to_string(), source_range_str, cmd_str, id_to_source_range_str)
|
|
.map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: e.to_string().into(),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
|
|
let value = crate::wasm::JsFuture::from(promise).await.map_err(|e| {
|
|
// Try to parse the error as an engine error.
|
|
let err_str = e.as_string().unwrap_or_default();
|
|
if let Ok(kittycad_modeling_cmds::websocket::FailureWebSocketResponse { errors, .. }) =
|
|
serde_json::from_str(&err_str)
|
|
{
|
|
KclError::Engine(KclErrorDetails {
|
|
message: errors.iter().map(|e| e.message.clone()).collect::<Vec<_>>().join("\n"),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
} else {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: format!("Failed to wait for promise from send modeling command: {:?}", e),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
}
|
|
})?;
|
|
|
|
if value.is_null() || value.is_undefined() {
|
|
return Err(KclError::Engine(KclErrorDetails {
|
|
message: "Received null or undefined response from engine".into(),
|
|
source_ranges: vec![source_range],
|
|
}));
|
|
}
|
|
|
|
// Convert JsValue to a Uint8Array
|
|
let data = js_sys::Uint8Array::from(value);
|
|
|
|
let ws_result: WebSocketResponse = bson::from_slice(&data.to_vec()).map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: format!("Failed to deserialize bson response from engine: {:?}", e),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
|
|
Ok(ws_result)
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl crate::engine::EngineManager for EngineConnection {
|
|
fn batch(&self) -> Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>> {
|
|
self.batch.clone()
|
|
}
|
|
|
|
fn batch_end(&self) -> Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
|
|
self.batch_end.clone()
|
|
}
|
|
|
|
fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>> {
|
|
self.responses.clone()
|
|
}
|
|
|
|
fn stats(&self) -> &EngineStats {
|
|
&self.stats
|
|
}
|
|
|
|
fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>> {
|
|
self.artifact_commands.clone()
|
|
}
|
|
|
|
fn get_default_planes(&self) -> Arc<RwLock<Option<DefaultPlanes>>> {
|
|
self.default_planes.clone()
|
|
}
|
|
|
|
async fn clear_scene_post_hook(
|
|
&self,
|
|
id_generator: &mut IdGenerator,
|
|
source_range: SourceRange,
|
|
) -> Result<(), KclError> {
|
|
// Remake the default planes, since they would have been removed after the scene was cleared.
|
|
let new_planes = self.new_default_planes(id_generator, source_range).await?;
|
|
*self.default_planes.write().await = Some(new_planes);
|
|
|
|
// Start a new session.
|
|
let promise = self.manager.start_new_session().map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: e.to_string().into(),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
|
|
crate::wasm::JsFuture::from(promise).await.map_err(|e| {
|
|
KclError::Engine(KclErrorDetails {
|
|
message: format!("Failed to wait for promise from start new session: {:?}", e),
|
|
source_ranges: vec![source_range],
|
|
})
|
|
})?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn inner_send_modeling_cmd(
|
|
&self,
|
|
id: uuid::Uuid,
|
|
source_range: SourceRange,
|
|
cmd: WebSocketRequest,
|
|
id_to_source_range: HashMap<uuid::Uuid, SourceRange>,
|
|
) -> Result<WebSocketResponse, KclError> {
|
|
let ws_result = self
|
|
.do_send_modeling_cmd(id, source_range, cmd, id_to_source_range)
|
|
.await?;
|
|
|
|
let mut responses = self.responses.write().await;
|
|
responses.insert(id, ws_result.clone());
|
|
drop(responses);
|
|
|
|
Ok(ws_result)
|
|
}
|
|
|
|
// maybe we can actually impl this here? not sure how atm.
|
|
async fn close(&self) {}
|
|
}
|