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/web_worker.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'cli/ops/web_worker.rs') diff --git a/cli/ops/web_worker.rs b/cli/ops/web_worker.rs index 9d8140d7b..fad0b9df7 100644 --- a/cli/ops/web_worker.rs +++ b/cli/ops/web_worker.rs @@ -1,20 +1,18 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use crate::state::State; use crate::web_worker::WebWorkerHandle; use crate::worker::WorkerEvent; -use deno_core::OpRegistry; use futures::channel::mpsc; -use std::rc::Rc; pub fn init( - s: &Rc, - sender: &mpsc::Sender, + rt: &mut deno_core::JsRuntime, + sender: mpsc::Sender, handle: WebWorkerHandle, ) { // Post message to host as guest worker. let sender_ = sender.clone(); - s.register_op_json_sync( + super::reg_json_sync( + rt, "op_worker_post_message", move |_state, _args, bufs| { assert_eq!(bufs.len(), 1, "Invalid number of arguments"); @@ -28,10 +26,9 @@ pub fn init( ); // Notify host that guest worker closes. - let sender_ = sender.clone(); - s.register_op_json_sync("op_worker_close", move |_state, _args, _bufs| { + super::reg_json_sync(rt, "op_worker_close", move |_state, _args, _bufs| { // Notify parent that we're finished - sender_.clone().close_channel(); + sender.clone().close_channel(); // Terminate execution of current worker handle.terminate(); Ok(json!({})) -- cgit v1.2.3