1 files changed, 30 insertions, 19 deletions

diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs
index 379bacf98..66a9b007b 100644
--- a/cli/ops/timers.rs
+++ b/cli/ops/timers.rs
@@ -1,30 +1,39 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use super::dispatch_json::{Deserialize, JsonOp, Value};
+use super::dispatch_json::{Deserialize, Value};
 use crate::state::State;
+use deno_core::BufVec;
 use deno_core::CoreIsolate;
 use deno_core::ErrBox;
+use deno_core::ResourceTable;
 use deno_core::ZeroCopyBuf;
 use futures::future::FutureExt;
+use std::cell::RefCell;
 use std::rc::Rc;
 use std::time::Duration;
 use std::time::Instant;
 
 pub fn init(i: &mut CoreIsolate, s: &Rc<State>) {
+  let t = &CoreIsolate::state(i).borrow().resource_table.clone();
+
   i.register_op(
     "op_global_timer_stop",
-    s.stateful_json_op(op_global_timer_stop),
+    s.stateful_json_op_sync(t, op_global_timer_stop),
+  );
+  i.register_op(
+    "op_global_timer",
+    s.stateful_json_op_async(t, op_global_timer),
   );
-  i.register_op("op_global_timer", s.stateful_json_op(op_global_timer));
-  i.register_op("op_now", s.stateful_json_op(op_now));
+  i.register_op("op_now", s.stateful_json_op_sync(t, op_now));
 }
 
 fn op_global_timer_stop(
-  state: &Rc<State>,
+  state: &State,
+  _resource_table: &mut ResourceTable,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, ErrBox> {
+) -> Result<Value, ErrBox> {
   state.global_timer.borrow_mut().cancel();
-  Ok(JsonOp::Sync(json!({})))
+  Ok(json!({}))
 }
 
 #[derive(Deserialize)]
@@ -32,22 +41,23 @@ struct GlobalTimerArgs {
   timeout: u64,
 }
 
-fn op_global_timer(
-  state: &Rc<State>,
+async fn op_global_timer(
+  state: Rc<State>,
+  _resource_table: Rc<RefCell<ResourceTable>>,
   args: Value,
-  _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, ErrBox> {
+  _zero_copy: BufVec,
+) -> Result<Value, ErrBox> {
   let args: GlobalTimerArgs = serde_json::from_value(args)?;
   let val = args.timeout;
 
   let deadline = Instant::now() + Duration::from_millis(val);
-  let f = state
+  let timer_fut = state
     .global_timer
     .borrow_mut()
     .new_timeout(deadline)
-    .then(move |_| futures::future::ok(json!({})));
-
-  Ok(JsonOp::Async(f.boxed_local()))
+    .boxed_local();
+  let _ = timer_fut.await;
+  Ok(json!({}))
 }
 
 // Returns a milliseconds and nanoseconds subsec
@@ -55,10 +65,11 @@ fn op_global_timer(
 // If the High precision flag is not set, the
 // nanoseconds are rounded on 2ms.
 fn op_now(
-  state: &Rc<State>,
+  state: &State,
+  _resource_table: &mut ResourceTable,
   _args: Value,
   _zero_copy: &mut [ZeroCopyBuf],
-) -> Result<JsonOp, ErrBox> {
+) -> Result<Value, ErrBox> {
   let seconds = state.start_time.elapsed().as_secs();
   let mut subsec_nanos = state.start_time.elapsed().subsec_nanos();
   let reduced_time_precision = 2_000_000; // 2ms in nanoseconds
@@ -70,8 +81,8 @@ fn op_now(
     subsec_nanos -= subsec_nanos % reduced_time_precision;
   }
 
-  Ok(JsonOp::Sync(json!({
+  Ok(json!({
     "seconds": seconds,
     "subsecNanos": subsec_nanos,
-  })))
+  }))
 }