mirror of
https://github.com/denoland/deno.git
synced 2024-11-26 16:09:27 -05:00
e5beb800c9
This commit moves implementation of "JsRuntimeInspector" to "deno_core" crate. To achieve that following changes were made: * "Worker" and "WebWorker" no longer own instance of "JsRuntimeInspector", instead it is now owned by "deno_core::JsRuntime". * Consequently polling of inspector is no longer done in "Worker"/"WebWorker", instead it's done in "deno_core::JsRuntime::poll_event_loop". * "deno_core::JsRuntime::poll_event_loop" and "deno_core::JsRuntime::run_event_loop", now accept "wait_for_inspector" boolean that tells if event loop should still be "pending" if there are active inspector sessions - this change fixes the problem that inspector disconnects from the frontend and process exits once the code has stopped executing.
143 lines
4.3 KiB
Rust
143 lines
4.3 KiB
Rust
// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use crate::error::AnyError;
|
|
use crate::serialize_op_result;
|
|
use crate::Op;
|
|
use crate::OpFn;
|
|
use crate::OpState;
|
|
use serde::de::DeserializeOwned;
|
|
use serde::Serialize;
|
|
use std::cell::RefCell;
|
|
use std::future::Future;
|
|
use std::rc::Rc;
|
|
|
|
/// Creates an op that passes data synchronously using JSON.
|
|
///
|
|
/// The provided function `op_fn` has the following parameters:
|
|
/// * `&mut OpState`: the op state, can be used to read/write resources in the runtime from an op.
|
|
/// * `V`: the deserializable value that is passed to the Rust function.
|
|
/// * `&mut [ZeroCopyBuf]`: raw bytes passed along, usually not needed if the JSON value is used.
|
|
///
|
|
/// `op_fn` returns a serializable value, which is directly returned to JavaScript.
|
|
///
|
|
/// When registering an op like this...
|
|
/// ```ignore
|
|
/// let mut runtime = JsRuntime::new(...);
|
|
/// runtime.register_op("hello", deno_core::op_sync(Self::hello_op));
|
|
/// runtime.sync_ops_cache();
|
|
/// ```
|
|
///
|
|
/// ...it can be invoked from JS using the provided name, for example:
|
|
/// ```js
|
|
/// let result = Deno.core.opSync("function_name", args);
|
|
/// ```
|
|
///
|
|
/// `runtime.sync_ops_cache()` must be called after registering new ops
|
|
/// A more complete example is available in the examples directory.
|
|
pub fn op_sync<F, A, B, R>(op_fn: F) -> Box<OpFn>
|
|
where
|
|
F: Fn(&mut OpState, A, B) -> Result<R, AnyError> + 'static,
|
|
A: DeserializeOwned,
|
|
B: DeserializeOwned,
|
|
R: Serialize + 'static,
|
|
{
|
|
Box::new(move |state, payload| -> Op {
|
|
let result = payload
|
|
.deserialize()
|
|
.and_then(|(a, b)| op_fn(&mut state.borrow_mut(), a, b));
|
|
Op::Sync(serialize_op_result(result, state))
|
|
})
|
|
}
|
|
|
|
/// Creates an op that passes data asynchronously using JSON.
|
|
///
|
|
/// The provided function `op_fn` has the following parameters:
|
|
/// * `Rc<RefCell<OpState>`: the op state, can be used to read/write resources in the runtime from an op.
|
|
/// * `V`: the deserializable value that is passed to the Rust function.
|
|
/// * `BufVec`: raw bytes passed along, usually not needed if the JSON value is used.
|
|
///
|
|
/// `op_fn` returns a future, whose output is a serializable value. This value will be asynchronously
|
|
/// returned to JavaScript.
|
|
///
|
|
/// When registering an op like this...
|
|
/// ```ignore
|
|
/// let mut runtime = JsRuntime::new(...);
|
|
/// runtime.register_op("hello", deno_core::op_async(Self::hello_op));
|
|
/// runtime.sync_ops_cache();
|
|
/// ```
|
|
///
|
|
/// ...it can be invoked from JS using the provided name, for example:
|
|
/// ```js
|
|
/// let future = Deno.core.opAsync("function_name", args);
|
|
/// ```
|
|
///
|
|
/// `runtime.sync_ops_cache()` must be called after registering new ops
|
|
/// A more complete example is available in the examples directory.
|
|
pub fn op_async<F, A, B, R, RV>(op_fn: F) -> Box<OpFn>
|
|
where
|
|
F: Fn(Rc<RefCell<OpState>>, A, B) -> R + 'static,
|
|
A: DeserializeOwned,
|
|
B: DeserializeOwned,
|
|
R: Future<Output = Result<RV, AnyError>> + 'static,
|
|
RV: Serialize + 'static,
|
|
{
|
|
Box::new(move |state, payload| -> Op {
|
|
let pid = payload.promise_id;
|
|
// Deserialize args, sync error on failure
|
|
let args = match payload.deserialize() {
|
|
Ok(args) => args,
|
|
Err(err) => {
|
|
return Op::Sync(serialize_op_result(Err::<(), AnyError>(err), state))
|
|
}
|
|
};
|
|
let (a, b) = args;
|
|
|
|
use crate::futures::FutureExt;
|
|
let fut = op_fn(state.clone(), a, b)
|
|
.map(move |result| (pid, serialize_op_result(result, state)));
|
|
Op::Async(Box::pin(fut))
|
|
})
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn op_async_stack_trace() {
|
|
let mut runtime = crate::JsRuntime::new(Default::default());
|
|
|
|
async fn op_throw(
|
|
_state: Rc<RefCell<OpState>>,
|
|
msg: Option<String>,
|
|
_: (),
|
|
) -> Result<(), AnyError> {
|
|
assert_eq!(msg.unwrap(), "hello");
|
|
Err(crate::error::generic_error("foo"))
|
|
}
|
|
|
|
runtime.register_op("op_throw", op_async(op_throw));
|
|
runtime.sync_ops_cache();
|
|
runtime
|
|
.execute(
|
|
"<init>",
|
|
r#"
|
|
async function f1() {
|
|
await Deno.core.opAsync('op_throw', 'hello');
|
|
}
|
|
|
|
async function f2() {
|
|
await f1();
|
|
}
|
|
|
|
f2();
|
|
"#,
|
|
)
|
|
.unwrap();
|
|
let e = runtime.run_event_loop(false).await.unwrap_err().to_string();
|
|
println!("{}", e);
|
|
assert!(e.contains("Error: foo"));
|
|
assert!(e.contains("at async f1 (<init>:"));
|
|
assert!(e.contains("at async f2 (<init>:"));
|
|
}
|
|
}
|