1 files changed, 47 insertions, 57 deletions

diff --git a/core/ops_json.rs b/core/ops_json.rs
index 0ef91ed33..ee336830b 100644
--- a/core/ops_json.rs
+++ b/core/ops_json.rs
@@ -1,37 +1,19 @@
 // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
 
-use crate::error::type_error;
 use crate::error::AnyError;
+use crate::serialize_op_result;
 use crate::BufVec;
 use crate::Op;
 use crate::OpFn;
+use crate::OpPayload;
 use crate::OpState;
 use crate::ZeroCopyBuf;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use std::cell::RefCell;
-use std::convert::TryInto;
 use std::future::Future;
 use std::rc::Rc;
 
-fn json_serialize_op_result<R: Serialize>(
-  request_id: Option<u64>,
-  result: Result<R, AnyError>,
-  get_error_class_fn: crate::runtime::GetErrorClassFn,
-) -> Box<[u8]> {
-  let value = match result {
-    Ok(v) => serde_json::json!({ "ok": v, "requestId": request_id }),
-    Err(err) => serde_json::json!({
-      "requestId": request_id,
-      "err": {
-        "className": (get_error_class_fn)(&err),
-        "message": err.to_string(),
-      }
-    }),
-  };
-  serde_json::to_vec(&value).unwrap().into_boxed_slice()
-}
-
 /// Creates an op that passes data synchronously using JSON.
 ///
 /// The provided function `op_fn` has the following parameters:
@@ -59,15 +41,20 @@ pub fn json_op_sync<F, V, R>(op_fn: F) -> Box<OpFn>
 where
   F: Fn(&mut OpState, V, &mut [ZeroCopyBuf]) -> Result<R, AnyError> + 'static,
   V: DeserializeOwned,
-  R: Serialize,
+  R: Serialize + 'static,
 {
-  Box::new(move |state: Rc<RefCell<OpState>>, mut bufs: BufVec| -> Op {
-    let result = serde_json::from_slice(&bufs[0])
-      .map_err(AnyError::from)
-      .and_then(|args| op_fn(&mut state.borrow_mut(), args, &mut bufs[1..]));
-    let buf =
-      json_serialize_op_result(None, result, state.borrow().get_error_class_fn);
-    Op::Sync(buf)
+  Box::new(move |state, payload, buf: Option<ZeroCopyBuf>| -> Op {
+    // For sig compat map Option<ZeroCopyBuf> to BufVec
+    let mut bufs: BufVec = match buf {
+      Some(b) => vec![b],
+      None => vec![],
+    }
+    .into();
+
+    let result = payload
+      .deserialize()
+      .and_then(|args| op_fn(&mut state.borrow_mut(), args, &mut bufs));
+    Op::Sync(serialize_op_result(result, state))
   })
 }
 
@@ -100,35 +87,38 @@ where
   F: Fn(Rc<RefCell<OpState>>, V, BufVec) -> R + 'static,
   V: DeserializeOwned,
   R: Future<Output = Result<RV, AnyError>> + 'static,
-  RV: Serialize,
+  RV: Serialize + 'static,
 {
-  let try_dispatch_op =
-    move |state: Rc<RefCell<OpState>>, bufs: BufVec| -> Result<Op, AnyError> {
-      let request_id = bufs[0]
-        .get(0..8)
-        .map(|b| u64::from_le_bytes(b.try_into().unwrap()))
-        .ok_or_else(|| type_error("missing or invalid `requestId`"))?;
-      let args = serde_json::from_slice(&bufs[0][8..])?;
-      let bufs = bufs[1..].into();
-      use crate::futures::FutureExt;
-      let fut = op_fn(state.clone(), args, bufs).map(move |result| {
-        json_serialize_op_result(
-          Some(request_id),
-          result,
-          state.borrow().get_error_class_fn,
-        )
-      });
-      Ok(Op::Async(Box::pin(fut)))
-    };
-
-  Box::new(move |state: Rc<RefCell<OpState>>, bufs: BufVec| -> Op {
-    match try_dispatch_op(state.clone(), bufs) {
-      Ok(op) => op,
-      Err(err) => Op::Sync(json_serialize_op_result(
-        None,
-        Err::<(), AnyError>(err),
-        state.borrow().get_error_class_fn,
-      )),
+  let try_dispatch_op = move |state: Rc<RefCell<OpState>>,
+                              p: OpPayload,
+                              b: Option<ZeroCopyBuf>|
+        -> Result<Op, AnyError> {
+    // For sig compat map Option<ZeroCopyBuf> to BufVec
+    let bufs: BufVec = match b {
+      Some(b) => vec![b],
+      None => vec![],
     }
-  })
+    .into();
+    // Parse args
+    let args = p.deserialize()?;
+
+    use crate::futures::FutureExt;
+    let fut = op_fn(state.clone(), args, bufs)
+      .map(move |result| serialize_op_result(result, state));
+    Ok(Op::Async(Box::pin(fut)))
+  };
+
+  Box::new(
+    move |state: Rc<RefCell<OpState>>,
+          p: OpPayload,
+          b: Option<ZeroCopyBuf>|
+          -> Op {
+      match try_dispatch_op(state.clone(), p, b) {
+        Ok(op) => op,
+        Err(err) => {
+          Op::Sync(serialize_op_result(Err::<(), AnyError>(err), state))
+        }
+      }
+    },
+  )
 }