From 7c2e7c660804afca823d60e6496aa853f75db16c Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Thu, 10 Sep 2020 09:57:45 -0400 Subject: Use gotham-like state for ops (#7385) Provides a concrete state type that can be dynamically added. This is necessary for op crates. * renames BasicState to OpState * async ops take `Rc>` * sync ops take `&mut OpState` * removes `OpRegistry`, `OpRouter` traits * `get_error_class_fn` moved to OpState * ResourceTable moved to OpState --- cli/ops/mod.rs | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'cli/ops/mod.rs') diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs index 06a55bade..3858400a3 100644 --- a/cli/ops/mod.rs +++ b/cli/ops/mod.rs @@ -29,3 +29,43 @@ pub mod tty; pub mod web_worker; pub mod websocket; pub mod worker_host; + +use crate::metrics::metrics_op; +use deno_core::json_op_async; +use deno_core::json_op_sync; +use deno_core::BufVec; +use deno_core::ErrBox; +use deno_core::JsRuntime; +use deno_core::OpState; +use deno_core::ZeroCopyBuf; +use serde_json::Value; +use std::cell::RefCell; +use std::future::Future; +use std::rc::Rc; + +pub fn reg_json_async(rt: &mut JsRuntime, name: &'static str, op_fn: F) +where + F: Fn(Rc>, Value, BufVec) -> R + 'static, + R: Future> + 'static, +{ + rt.register_op(name, metrics_op(json_op_async(op_fn))); +} + +pub fn reg_json_sync(rt: &mut JsRuntime, name: &'static str, op_fn: F) +where + F: Fn(&mut OpState, Value, &mut [ZeroCopyBuf]) -> Result + + 'static, +{ + rt.register_op(name, metrics_op(json_op_sync(op_fn))); +} + +/// Helper for extracting the commonly used state. Used for sync ops. +pub fn cli_state(state: &OpState) -> Rc { + state.borrow::>().clone() +} + +/// Helper for extracting the commonly used state. Used for async ops. +pub fn cli_state2(state: &Rc>) -> Rc { + let state = state.borrow(); + state.borrow::>().clone() +} -- cgit v1.2.3