2021-04-25 13:23:22 -04:00
|
|
|
use crate::error::type_error;
|
|
|
|
use crate::error::AnyError;
|
2021-04-30 21:08:29 -04:00
|
|
|
use crate::include_js_files;
|
|
|
|
use crate::op_sync;
|
2021-04-25 13:23:22 -04:00
|
|
|
use crate::resources::ResourceId;
|
2021-04-30 21:08:29 -04:00
|
|
|
use crate::Extension;
|
2021-04-25 13:23:22 -04:00
|
|
|
use crate::OpState;
|
refactor(core): Turn the `wasm_streaming_feed` binding into ops (#11985)
Async WebAssembly compilation was implemented by adding two
bindings: `set_wasm_streaming_callback`, which registered a callback to
be called whenever a streaming wasm compilation was started, and
`wasm_streaming_feed`, which let the JS callback modify the state of the
v8 wasm compiler.
`set_wasm_streaming_callback` cannot currently be implemented as
anything other than a binding, but `wasm_streaming_feed` does not really
need to use anything specific to bindings, and could indeed be
implemented as one or more ops. This PR does that, resulting in a
simplification of the relevant code.
There are three operations on the state of the v8 wasm compiler that
`wasm_streaming_feed` allowed: feeding new bytes into the compiler,
letting it know that there are no more bytes coming from the network,
and aborting the compilation. This PR provides `op_wasm_streaming_feed`
to feed new bytes into the compiler, and `op_wasm_streaming_abort` to
abort the compilation. It doesn't provide an op to let v8 know that the
response is finished, but closing the resource with `Deno.core.close()`
will achieve that.
2021-09-13 08:27:54 -04:00
|
|
|
use crate::Resource;
|
|
|
|
use crate::ZeroCopyBuf;
|
|
|
|
use std::cell::RefCell;
|
2021-05-03 08:51:32 -04:00
|
|
|
use std::io::{stderr, stdout, Write};
|
refactor(core): Turn the `wasm_streaming_feed` binding into ops (#11985)
Async WebAssembly compilation was implemented by adding two
bindings: `set_wasm_streaming_callback`, which registered a callback to
be called whenever a streaming wasm compilation was started, and
`wasm_streaming_feed`, which let the JS callback modify the state of the
v8 wasm compiler.
`set_wasm_streaming_callback` cannot currently be implemented as
anything other than a binding, but `wasm_streaming_feed` does not really
need to use anything specific to bindings, and could indeed be
implemented as one or more ops. This PR does that, resulting in a
simplification of the relevant code.
There are three operations on the state of the v8 wasm compiler that
`wasm_streaming_feed` allowed: feeding new bytes into the compiler,
letting it know that there are no more bytes coming from the network,
and aborting the compilation. This PR provides `op_wasm_streaming_feed`
to feed new bytes into the compiler, and `op_wasm_streaming_abort` to
abort the compilation. It doesn't provide an op to let v8 know that the
response is finished, but closing the resource with `Deno.core.close()`
will achieve that.
2021-09-13 08:27:54 -04:00
|
|
|
use std::rc::Rc;
|
2021-04-25 13:23:22 -04:00
|
|
|
|
2021-04-30 21:08:29 -04:00
|
|
|
pub(crate) fn init_builtins() -> Extension {
|
|
|
|
Extension::builder()
|
|
|
|
.js(include_js_files!(
|
|
|
|
prefix "deno:core",
|
2021-07-02 06:18:30 -04:00
|
|
|
"00_primordials.js",
|
|
|
|
"01_core.js",
|
|
|
|
"02_error.js",
|
2021-04-30 21:08:29 -04:00
|
|
|
))
|
|
|
|
.ops(vec![
|
|
|
|
("op_close", op_sync(op_close)),
|
2021-09-10 18:47:09 -04:00
|
|
|
("op_try_close", op_sync(op_try_close)),
|
2021-05-02 19:30:03 -04:00
|
|
|
("op_print", op_sync(op_print)),
|
2021-04-30 21:08:29 -04:00
|
|
|
("op_resources", op_sync(op_resources)),
|
refactor(core): Turn the `wasm_streaming_feed` binding into ops (#11985)
Async WebAssembly compilation was implemented by adding two
bindings: `set_wasm_streaming_callback`, which registered a callback to
be called whenever a streaming wasm compilation was started, and
`wasm_streaming_feed`, which let the JS callback modify the state of the
v8 wasm compiler.
`set_wasm_streaming_callback` cannot currently be implemented as
anything other than a binding, but `wasm_streaming_feed` does not really
need to use anything specific to bindings, and could indeed be
implemented as one or more ops. This PR does that, resulting in a
simplification of the relevant code.
There are three operations on the state of the v8 wasm compiler that
`wasm_streaming_feed` allowed: feeding new bytes into the compiler,
letting it know that there are no more bytes coming from the network,
and aborting the compilation. This PR provides `op_wasm_streaming_feed`
to feed new bytes into the compiler, and `op_wasm_streaming_abort` to
abort the compilation. It doesn't provide an op to let v8 know that the
response is finished, but closing the resource with `Deno.core.close()`
will achieve that.
2021-09-13 08:27:54 -04:00
|
|
|
("op_wasm_streaming_feed", op_sync(op_wasm_streaming_feed)),
|
|
|
|
("op_wasm_streaming_abort", op_sync(op_wasm_streaming_abort)),
|
2021-10-10 10:03:23 -04:00
|
|
|
(
|
|
|
|
"op_wasm_streaming_set_url",
|
|
|
|
op_sync(op_wasm_streaming_set_url),
|
|
|
|
),
|
2021-04-30 21:08:29 -04:00
|
|
|
])
|
|
|
|
.build()
|
|
|
|
}
|
2021-04-25 13:23:22 -04:00
|
|
|
|
|
|
|
/// Return map of resources with id as key
|
|
|
|
/// and string representation as value.
|
|
|
|
pub fn op_resources(
|
|
|
|
state: &mut OpState,
|
2021-10-05 16:38:27 -04:00
|
|
|
_: (),
|
2021-05-08 08:37:42 -04:00
|
|
|
_: (),
|
2021-04-25 13:23:22 -04:00
|
|
|
) -> Result<Vec<(ResourceId, String)>, AnyError> {
|
|
|
|
let serialized_resources = state
|
|
|
|
.resource_table
|
|
|
|
.names()
|
|
|
|
.map(|(rid, name)| (rid, name.to_string()))
|
|
|
|
.collect();
|
|
|
|
Ok(serialized_resources)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Remove a resource from the resource table.
|
|
|
|
pub fn op_close(
|
|
|
|
state: &mut OpState,
|
|
|
|
rid: Option<ResourceId>,
|
2021-05-08 08:37:42 -04:00
|
|
|
_: (),
|
2021-04-25 13:23:22 -04:00
|
|
|
) -> Result<(), AnyError> {
|
2021-09-10 18:47:09 -04:00
|
|
|
// TODO(@AaronO): drop Option after improving type-strictness balance in
|
|
|
|
// serde_v8
|
2021-04-25 13:23:22 -04:00
|
|
|
let rid = rid.ok_or_else(|| type_error("missing or invalid `rid`"))?;
|
2021-08-15 07:29:19 -04:00
|
|
|
state.resource_table.close(rid)?;
|
2021-09-10 18:47:09 -04:00
|
|
|
Ok(())
|
|
|
|
}
|
2021-04-25 13:23:22 -04:00
|
|
|
|
2021-09-10 18:47:09 -04:00
|
|
|
/// Try to remove a resource from the resource table. If there is no resource
|
|
|
|
/// with the specified `rid`, this is a no-op.
|
|
|
|
pub fn op_try_close(
|
|
|
|
state: &mut OpState,
|
|
|
|
rid: Option<ResourceId>,
|
|
|
|
_: (),
|
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
// TODO(@AaronO): drop Option after improving type-strictness balance in
|
|
|
|
// serde_v8.
|
|
|
|
let rid = rid.ok_or_else(|| type_error("missing or invalid `rid`"))?;
|
|
|
|
let _ = state.resource_table.close(rid);
|
2021-04-25 13:23:22 -04:00
|
|
|
Ok(())
|
|
|
|
}
|
2021-05-02 19:30:03 -04:00
|
|
|
|
|
|
|
/// Builtin utility to print to stdout/stderr
|
|
|
|
pub fn op_print(
|
|
|
|
_state: &mut OpState,
|
2021-05-15 09:22:57 -04:00
|
|
|
msg: String,
|
|
|
|
is_err: bool,
|
2021-05-02 19:30:03 -04:00
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
if is_err {
|
2021-06-21 22:39:59 -04:00
|
|
|
stderr().write_all(msg.as_bytes())?;
|
2021-05-03 08:51:32 -04:00
|
|
|
stderr().flush().unwrap();
|
2021-05-02 19:30:03 -04:00
|
|
|
} else {
|
2021-06-21 22:39:59 -04:00
|
|
|
stdout().write_all(msg.as_bytes())?;
|
2021-05-02 19:30:03 -04:00
|
|
|
stdout().flush().unwrap();
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
refactor(core): Turn the `wasm_streaming_feed` binding into ops (#11985)
Async WebAssembly compilation was implemented by adding two
bindings: `set_wasm_streaming_callback`, which registered a callback to
be called whenever a streaming wasm compilation was started, and
`wasm_streaming_feed`, which let the JS callback modify the state of the
v8 wasm compiler.
`set_wasm_streaming_callback` cannot currently be implemented as
anything other than a binding, but `wasm_streaming_feed` does not really
need to use anything specific to bindings, and could indeed be
implemented as one or more ops. This PR does that, resulting in a
simplification of the relevant code.
There are three operations on the state of the v8 wasm compiler that
`wasm_streaming_feed` allowed: feeding new bytes into the compiler,
letting it know that there are no more bytes coming from the network,
and aborting the compilation. This PR provides `op_wasm_streaming_feed`
to feed new bytes into the compiler, and `op_wasm_streaming_abort` to
abort the compilation. It doesn't provide an op to let v8 know that the
response is finished, but closing the resource with `Deno.core.close()`
will achieve that.
2021-09-13 08:27:54 -04:00
|
|
|
|
|
|
|
pub struct WasmStreamingResource(pub(crate) RefCell<rusty_v8::WasmStreaming>);
|
|
|
|
|
|
|
|
impl Resource for WasmStreamingResource {
|
|
|
|
fn close(self: Rc<Self>) {
|
|
|
|
// At this point there are no clones of Rc<WasmStreamingResource> on the
|
|
|
|
// resource table, and no one should own a reference outside of the stack.
|
|
|
|
// Therefore, we can be sure `self` is the only reference.
|
|
|
|
if let Ok(wsr) = Rc::try_unwrap(self) {
|
|
|
|
wsr.0.into_inner().finish();
|
|
|
|
} else {
|
|
|
|
panic!("Couldn't consume WasmStreamingResource.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Feed bytes to WasmStreamingResource.
|
|
|
|
pub fn op_wasm_streaming_feed(
|
|
|
|
state: &mut OpState,
|
|
|
|
rid: ResourceId,
|
|
|
|
bytes: ZeroCopyBuf,
|
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
let wasm_streaming =
|
|
|
|
state.resource_table.get::<WasmStreamingResource>(rid)?;
|
|
|
|
|
|
|
|
wasm_streaming.0.borrow_mut().on_bytes_received(&bytes);
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Abort a WasmStreamingResource.
|
|
|
|
pub fn op_wasm_streaming_abort(
|
|
|
|
state: &mut OpState,
|
|
|
|
rid: ResourceId,
|
|
|
|
exception: serde_v8::Value,
|
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
let wasm_streaming =
|
|
|
|
state.resource_table.take::<WasmStreamingResource>(rid)?;
|
|
|
|
|
|
|
|
// At this point there are no clones of Rc<WasmStreamingResource> on the
|
|
|
|
// resource table, and no one should own a reference because we're never
|
|
|
|
// cloning them. So we can be sure `wasm_streaming` is the only reference.
|
|
|
|
if let Ok(wsr) = Rc::try_unwrap(wasm_streaming) {
|
|
|
|
wsr.0.into_inner().abort(Some(exception.v8_value));
|
|
|
|
} else {
|
|
|
|
panic!("Couldn't consume WasmStreamingResource.");
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
2021-10-10 10:03:23 -04:00
|
|
|
|
|
|
|
pub fn op_wasm_streaming_set_url(
|
|
|
|
state: &mut OpState,
|
|
|
|
rid: ResourceId,
|
|
|
|
url: String,
|
|
|
|
) -> Result<(), AnyError> {
|
|
|
|
let wasm_streaming =
|
|
|
|
state.resource_table.get::<WasmStreamingResource>(rid)?;
|
|
|
|
|
|
|
|
wasm_streaming.0.borrow_mut().set_url(&url);
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|