summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/op_fetch_asset.rs3
-rw-r--r--cli/ops/compiler.rs7
-rw-r--r--cli/ops/dispatch_json.rs31
-rw-r--r--cli/ops/dispatch_minimal.rs5
-rw-r--r--cli/ops/mod.rs1
-rw-r--r--cli/ops/plugin.rs9
-rw-r--r--cli/ops/web_worker.rs13
-rw-r--r--cli/state.rs45
8 files changed, 66 insertions, 48 deletions
diff --git a/cli/op_fetch_asset.rs b/cli/op_fetch_asset.rs
index d89ae20b3..0ebd84c43 100644
--- a/cli/op_fetch_asset.rs
+++ b/cli/op_fetch_asset.rs
@@ -4,7 +4,6 @@
pub use deno_core::v8_set_flags;
use deno_core::CoreIsolateState;
use deno_core::Op;
-use deno_core::OpDispatcher;
use deno_core::ZeroCopyBuf;
use std::collections::HashMap;
use std::path::PathBuf;
@@ -88,7 +87,7 @@ fn get_asset(name: &str) -> Option<&'static str> {
/// CoreIsolate.
pub fn op_fetch_asset<S: ::std::hash::BuildHasher>(
custom_assets: HashMap<String, PathBuf, S>,
-) -> impl OpDispatcher {
+) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op {
for (_, path) in custom_assets.iter() {
println!("cargo:rerun-if-changed={}", path.display());
}
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index 5af2f5eb0..d41369855 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -2,7 +2,6 @@
use super::dispatch_json::{JsonOp, Value};
use crate::op_error::OpError;
use crate::ops::json_op;
-use crate::ops::JsonOpDispatcher;
use crate::state::State;
use deno_core::CoreIsolate;
use deno_core::CoreIsolateState;
@@ -32,7 +31,11 @@ pub fn init(
pub fn compiler_op<D>(
response: Arc<Mutex<Option<String>>>,
dispatcher: D,
-) -> impl JsonOpDispatcher
+) -> impl Fn(
+ &mut deno_core::CoreIsolateState,
+ Value,
+ &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError>
where
D: Fn(
Arc<Mutex<Option<String>>>,
diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs
index ad6947dd1..2ec9d6c2f 100644
--- a/cli/ops/dispatch_json.rs
+++ b/cli/ops/dispatch_json.rs
@@ -3,7 +3,6 @@ use crate::op_error::OpError;
use deno_core::Buf;
use deno_core::CoreIsolateState;
use deno_core::Op;
-use deno_core::OpDispatcher;
use deno_core::ZeroCopyBuf;
use futures::future::FutureExt;
pub use serde_derive::Deserialize;
@@ -45,36 +44,16 @@ struct AsyncArgs {
promise_id: Option<u64>,
}
-/// Like OpDispatcher but with additional json `Value` parameter
-/// and return a result of `JsonOp` instead of `Op`.
-pub trait JsonOpDispatcher {
- fn dispatch(
- &self,
- isolate_state: &mut CoreIsolateState,
- json: Value,
- zero_copy: &mut [ZeroCopyBuf],
- ) -> Result<JsonOp, OpError>;
-}
-
-impl<F> JsonOpDispatcher for F
+pub fn json_op<D>(
+ d: D,
+) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
where
- F: Fn(
+ D: Fn(
&mut CoreIsolateState,
Value,
&mut [ZeroCopyBuf],
) -> Result<JsonOp, OpError>,
{
- fn dispatch(
- &self,
- isolate_state: &mut CoreIsolateState,
- json: Value,
- zero_copy: &mut [ZeroCopyBuf],
- ) -> Result<JsonOp, OpError> {
- self(isolate_state, json, zero_copy)
- }
-}
-
-pub fn json_op(d: impl JsonOpDispatcher) -> impl OpDispatcher {
move |isolate_state: &mut CoreIsolateState, zero_copy: &mut [ZeroCopyBuf]| {
assert!(!zero_copy.is_empty(), "Expected JSON string at position 0");
let async_args: AsyncArgs = match serde_json::from_slice(&zero_copy[0]) {
@@ -89,7 +68,7 @@ pub fn json_op(d: impl JsonOpDispatcher) -> impl OpDispatcher {
let result = serde_json::from_slice(&zero_copy[0])
.map_err(OpError::from)
- .and_then(|args| d.dispatch(isolate_state, args, &mut zero_copy[1..]));
+ .and_then(|args| d(isolate_state, args, &mut zero_copy[1..]));
// Convert to Op
match result {
diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs
index 9cb81d4bc..df7d48b4e 100644
--- a/cli/ops/dispatch_minimal.rs
+++ b/cli/ops/dispatch_minimal.rs
@@ -9,7 +9,6 @@ use byteorder::{LittleEndian, WriteBytesExt};
use deno_core::Buf;
use deno_core::CoreIsolateState;
use deno_core::Op;
-use deno_core::OpDispatcher;
use deno_core::ZeroCopyBuf;
use futures::future::FutureExt;
use std::future::Future;
@@ -119,7 +118,9 @@ fn test_parse_min_record() {
assert_eq!(parse_min_record(&buf), None);
}
-pub fn minimal_op<D>(d: D) -> impl OpDispatcher
+pub fn minimal_op<D>(
+ d: D,
+) -> impl Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
where
D: Fn(&mut CoreIsolateState, bool, i32, &mut [ZeroCopyBuf]) -> MinimalOp,
{
diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
index 331ed4aa1..ef8c3bd0f 100644
--- a/cli/ops/mod.rs
+++ b/cli/ops/mod.rs
@@ -4,7 +4,6 @@ mod dispatch_minimal;
pub use dispatch_json::json_op;
pub use dispatch_json::JsonOp;
-pub use dispatch_json::JsonOpDispatcher;
pub use dispatch_json::JsonResult;
pub use dispatch_minimal::minimal_op;
pub use dispatch_minimal::MinimalOp;
diff --git a/cli/ops/plugin.rs b/cli/ops/plugin.rs
index 3edcaa962..16debac50 100644
--- a/cli/ops/plugin.rs
+++ b/cli/ops/plugin.rs
@@ -3,6 +3,7 @@ use crate::op_error::OpError;
use crate::ops::dispatch_json::Deserialize;
use crate::ops::dispatch_json::JsonOp;
use crate::ops::dispatch_json::Value;
+use crate::ops::json_op;
use crate::state::State;
use deno_core::plugin_api;
use deno_core::CoreIsolate;
@@ -20,7 +21,10 @@ use std::task::Context;
use std::task::Poll;
pub fn init(i: &mut CoreIsolate, s: &State) {
- i.register_op("op_open_plugin", s.stateful_json_op2(op_open_plugin));
+ i.register_op(
+ "op_open_plugin",
+ s.core_op(json_op(s.stateful_op2(op_open_plugin))),
+ );
}
#[derive(Deserialize)]
@@ -106,8 +110,7 @@ impl<'a> plugin_api::Interface for PluginInterface<'a> {
let plugin_lib = self.plugin_lib.clone();
self.isolate_state.op_registry.register(
name,
- move |isolate_state: &mut CoreIsolateState,
- zero_copy: &mut [ZeroCopyBuf]| {
+ move |isolate_state, zero_copy| {
let mut interface = PluginInterface::new(isolate_state, &plugin_lib);
let op = dispatch_op_fn(&mut interface, zero_copy);
match op {
diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs
index 4a661d2be..553278b07 100644
--- a/cli/ops/web_worker.rs
+++ b/cli/ops/web_worker.rs
@@ -2,7 +2,6 @@
use super::dispatch_json::{JsonOp, Value};
use crate::op_error::OpError;
use crate::ops::json_op;
-use crate::ops::JsonOpDispatcher;
use crate::state::State;
use crate::web_worker::WebWorkerHandle;
use crate::worker::WorkerEvent;
@@ -15,7 +14,11 @@ use std::convert::From;
pub fn web_worker_op<D>(
sender: mpsc::Sender<WorkerEvent>,
dispatcher: D,
-) -> impl JsonOpDispatcher
+) -> impl Fn(
+ &mut CoreIsolateState,
+ Value,
+ &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError>
where
D: Fn(
&mpsc::Sender<WorkerEvent>,
@@ -33,7 +36,11 @@ pub fn web_worker_op2<D>(
handle: WebWorkerHandle,
sender: mpsc::Sender<WorkerEvent>,
dispatcher: D,
-) -> impl JsonOpDispatcher
+) -> impl Fn(
+ &mut CoreIsolateState,
+ Value,
+ &mut [ZeroCopyBuf],
+) -> Result<JsonOp, OpError>
where
D: Fn(
WebWorkerHandle,
diff --git a/cli/state.rs b/cli/state.rs
index f04b577b4..35aaa7ed2 100644
--- a/cli/state.rs
+++ b/cli/state.rs
@@ -7,7 +7,6 @@ use crate::import_map::ImportMap;
use crate::metrics::Metrics;
use crate::op_error::OpError;
use crate::ops::JsonOp;
-use crate::ops::JsonOpDispatcher;
use crate::ops::MinimalOp;
use crate::permissions::Permissions;
use crate::tsc::TargetLib;
@@ -18,7 +17,6 @@ use deno_core::ModuleLoadId;
use deno_core::ModuleLoader;
use deno_core::ModuleSpecifier;
use deno_core::Op;
-use deno_core::OpDispatcher;
use deno_core::ZeroCopyBuf;
use futures::future::FutureExt;
use futures::Future;
@@ -66,7 +64,10 @@ pub struct StateInner {
}
impl State {
- pub fn stateful_json_op<D>(&self, dispatcher: D) -> impl OpDispatcher
+ pub fn stateful_json_op<D>(
+ &self,
+ dispatcher: D,
+ ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
where
D: Fn(&State, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>,
{
@@ -74,7 +75,10 @@ impl State {
self.core_op(json_op(self.stateful_op(dispatcher)))
}
- pub fn stateful_json_op2<D>(&self, dispatcher: D) -> impl OpDispatcher
+ pub fn stateful_json_op2<D>(
+ &self,
+ dispatcher: D,
+ ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
where
D: Fn(
&mut deno_core::CoreIsolateState,
@@ -90,7 +94,13 @@ impl State {
/// Wrap core `OpDispatcher` to collect metrics.
// TODO(ry) this should be private. Is called by stateful_json_op or
// stateful_minimal_op
- pub fn core_op(&self, dispatcher: impl OpDispatcher) -> impl OpDispatcher {
+ pub fn core_op<D>(
+ &self,
+ dispatcher: D,
+ ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
+ where
+ D: Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op,
+ {
let state = self.clone();
move |isolate_state: &mut deno_core::CoreIsolateState,
@@ -101,7 +111,7 @@ impl State {
let bytes_sent_zero_copy =
zero_copy[1..].iter().map(|b| b.len()).sum::<usize>() as u64;
- let op = dispatcher.dispatch(isolate_state, zero_copy);
+ let op = dispatcher(isolate_state, zero_copy);
match op {
Op::Sync(buf) => {
@@ -144,7 +154,10 @@ impl State {
}
}
- pub fn stateful_minimal_op2<D>(&self, dispatcher: D) -> impl OpDispatcher
+ pub fn stateful_minimal_op2<D>(
+ &self,
+ dispatcher: D,
+ ) -> impl Fn(&mut deno_core::CoreIsolateState, &mut [ZeroCopyBuf]) -> Op
where
D: Fn(
&mut deno_core::CoreIsolateState,
@@ -171,7 +184,14 @@ impl State {
/// NOTE: This only works with JSON dispatcher.
/// This is a band-aid for transition to `CoreIsolate.register_op` API as most of our
/// ops require `state` argument.
- pub fn stateful_op<D>(&self, dispatcher: D) -> impl JsonOpDispatcher
+ pub fn stateful_op<D>(
+ &self,
+ dispatcher: D,
+ ) -> impl Fn(
+ &mut deno_core::CoreIsolateState,
+ Value,
+ &mut [ZeroCopyBuf],
+ ) -> Result<JsonOp, OpError>
where
D: Fn(&State, Value, &mut [ZeroCopyBuf]) -> Result<JsonOp, OpError>,
{
@@ -182,7 +202,14 @@ impl State {
-> Result<JsonOp, OpError> { dispatcher(&state, args, zero_copy) }
}
- pub fn stateful_op2<D>(&self, dispatcher: D) -> impl JsonOpDispatcher
+ pub fn stateful_op2<D>(
+ &self,
+ dispatcher: D,
+ ) -> impl Fn(
+ &mut deno_core::CoreIsolateState,
+ Value,
+ &mut [ZeroCopyBuf],
+ ) -> Result<JsonOp, OpError>
where
D: Fn(
&mut deno_core::CoreIsolateState,
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 10:09:14 +0000