Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

make js cancellable (#1901)

Browse Source
This commit is contained in:
Aiden McClelland
2022-11-01 14:01:42 -06:00
parent defc98ab0e
commit 21cf4cd2ce
3 changed files with 28 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/js_engine/src/lib.rs
View File

@@ -11,7 +11,7 @@ use deno_core::{
resolve_import, Extension, JsRuntime, ModuleLoader, ModuleSource, ModuleSourceFuture,
ModuleSpecifier, ModuleType, OpDecl, RuntimeOptions, Snapshot,
};
use helpers::{script_dir, SingleThreadJoinHandle};
use helpers::{script_dir, spawn_local};
use models::{ExecCommand, PackageId, ProcedureName, TermCommand, Version, VolumeId};
use serde::{Deserialize, Serialize};
use serde_json::Value;
@@ -255,9 +255,8 @@ impl JsExecutionEnvironment {
));
}
};
let safer_handle =
SingleThreadJoinHandle::new(move || self.execute(procedure_name, input, variable_args));
let output = safer_handle.await?;
let safer_handle = spawn_local(|| self.execute(procedure_name, input, variable_args)).await;
let output = safer_handle.await.unwrap()?;
match serde_json::from_value(output.clone()) {
Ok(x) => Ok(x),
Err(err) => {