7
src/wasm-lib/Cargo.lock
generated
7
src/wasm-lib/Cargo.lock
generated
@ -1417,6 +1417,7 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"git_rev",
|
"git_rev",
|
||||||
"gltf-json",
|
"gltf-json",
|
||||||
|
"http 0.2.12",
|
||||||
"iai",
|
"iai",
|
||||||
"image",
|
"image",
|
||||||
"insta",
|
"insta",
|
||||||
@ -1481,9 +1482,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kittycad"
|
name = "kittycad"
|
||||||
version = "0.3.14"
|
version = "0.3.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ce5e9c51976882cdf6777557fd8c3ee68b00bb53e9307fc1721acb397f2ece9a"
|
checksum = "1a9621df809fa105ae28b01586c52ce46561e166702babb50e5bcc5097a8ce62"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -1869,7 +1870,7 @@ dependencies = [
|
|||||||
"bincode",
|
"bincode",
|
||||||
"either",
|
"either",
|
||||||
"fnv",
|
"fnv",
|
||||||
"itertools 0.10.5",
|
"itertools 0.12.1",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"nom",
|
"nom",
|
||||||
"quick-xml",
|
"quick-xml",
|
||||||
|
@ -70,7 +70,8 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
kittycad = { version = "0.3.14", default-features = false, features = ["js", "requests"] }
|
http = "0.2.12"
|
||||||
|
kittycad = { version = "0.3.16", default-features = false, features = ["js", "requests"] }
|
||||||
kittycad-modeling-session = "0.1.4"
|
kittycad-modeling-session = "0.1.4"
|
||||||
|
|
||||||
[[test]]
|
[[test]]
|
||||||
|
@ -25,6 +25,7 @@ form_urlencoded = "1.2.1"
|
|||||||
futures = { version = "0.3.30" }
|
futures = { version = "0.3.30" }
|
||||||
git_rev = "0.1.0"
|
git_rev = "0.1.0"
|
||||||
gltf-json = "1.4.1"
|
gltf-json = "1.4.1"
|
||||||
|
http = { workspace = true }
|
||||||
image = { version = "0.25.1", default-features = false, features = ["png"] }
|
image = { version = "0.25.1", default-features = false, features = ["png"] }
|
||||||
kittycad = { workspace = true, features = ["clap"] }
|
kittycad = { workspace = true, features = ["clap"] }
|
||||||
lazy_static = "1.5.0"
|
lazy_static = "1.5.0"
|
||||||
|
@ -1663,9 +1663,13 @@ impl From<crate::settings::types::ModelingSettings> for ExecutorSettings {
|
|||||||
|
|
||||||
impl ExecutorContext {
|
impl ExecutorContext {
|
||||||
/// Create a new default executor context.
|
/// Create a new default executor context.
|
||||||
|
/// Also returns the response HTTP headers from the server.
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
pub async fn new(client: &kittycad::Client, settings: ExecutorSettings) -> Result<Self> {
|
pub async fn new_with_headers(
|
||||||
let ws = client
|
client: &kittycad::Client,
|
||||||
|
settings: ExecutorSettings,
|
||||||
|
) -> Result<(Self, http::HeaderMap)> {
|
||||||
|
let (ws, headers) = client
|
||||||
.modeling()
|
.modeling()
|
||||||
.commands_ws(
|
.commands_ws(
|
||||||
None,
|
None,
|
||||||
@ -1697,13 +1701,21 @@ impl ExecutorContext {
|
|||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(Self {
|
let slf = Self {
|
||||||
engine,
|
engine,
|
||||||
fs: Arc::new(FileManager::new()),
|
fs: Arc::new(FileManager::new()),
|
||||||
stdlib: Arc::new(StdLib::new()),
|
stdlib: Arc::new(StdLib::new()),
|
||||||
settings,
|
settings,
|
||||||
is_mock: false,
|
is_mock: false,
|
||||||
})
|
};
|
||||||
|
Ok((slf, headers))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
/// Create a new default executor context.
|
||||||
|
pub async fn new(client: &kittycad::Client, settings: ExecutorSettings) -> Result<Self> {
|
||||||
|
let (slf, _headers) = Self::new_with_headers(client, settings).await?;
|
||||||
|
Ok(slf)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// For executing unit tests.
|
/// For executing unit tests.
|
||||||
|
@ -119,6 +119,7 @@ async fn inner_shell(
|
|||||||
args.batch_modeling_cmd(
|
args.batch_modeling_cmd(
|
||||||
uuid::Uuid::new_v4(),
|
uuid::Uuid::new_v4(),
|
||||||
ModelingCmd::Solid3DShellFace {
|
ModelingCmd::Solid3DShellFace {
|
||||||
|
hollow: false,
|
||||||
face_ids,
|
face_ids,
|
||||||
object_id: extrude_group.id,
|
object_id: extrude_group.id,
|
||||||
shell_thickness: data.thickness,
|
shell_thickness: data.thickness,
|
||||||
|
Reference in New Issue
Block a user