summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/web/timers.rs11
-rw-r--r--ext/websocket/lib.rs7
-rw-r--r--runtime/ops/web_worker.rs4
3 files changed, 14 insertions, 8 deletions
diff --git a/ext/web/timers.rs b/ext/web/timers.rs
index 6e0759a98..3a4e6cb06 100644
--- a/ext/web/timers.rs
+++ b/ext/web/timers.rs
@@ -5,6 +5,7 @@
use crate::hr_timer_lock::hr_timer_lock;
use deno_core::error::AnyError;
use deno_core::op;
+use deno_core::op2;
use deno_core::CancelFuture;
use deno_core::CancelHandle;
use deno_core::OpState;
@@ -79,13 +80,15 @@ pub fn op_timer_handle(state: &mut OpState) -> ResourceId {
/// [`TimerHandle`] resource given by `rid` has been canceled.
///
/// If the timer is canceled, this returns `false`. Otherwise, it returns `true`.
-#[op(deferred)]
+#[op2(async(lazy))]
pub async fn op_sleep(
state: Rc<RefCell<OpState>>,
- millis: u64,
- rid: ResourceId,
+ #[bigint] millis: u64,
+ #[smi] rid: ResourceId,
) -> Result<bool, AnyError> {
- let handle = state.borrow().resource_table.get::<TimerHandle>(rid)?;
+ let Ok(handle) = state.borrow().resource_table.get::<TimerHandle>(rid) else {
+ return Ok(true);
+ };
// If a timer is requested with <=100ms resolution, request the high-res timer. Since the default
// Windows timer period is 15ms, this means a 100ms timer could fire at 115ms (15% late). We assume that
diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs
index 4b05131d9..32e2d18cc 100644
--- a/ext/websocket/lib.rs
+++ b/ext/websocket/lib.rs
@@ -5,6 +5,7 @@ use deno_core::error::invalid_hostname;
use deno_core::error::type_error;
use deno_core::error::AnyError;
use deno_core::op;
+use deno_core::op2;
use deno_core::url;
use deno_core::AsyncMutFuture;
use deno_core::AsyncRefCell;
@@ -528,12 +529,12 @@ pub async fn op_ws_send_ping(
.await
}
-#[op(deferred)]
+#[op2(async(lazy))]
pub async fn op_ws_close(
state: Rc<RefCell<OpState>>,
- rid: ResourceId,
+ #[smi] rid: ResourceId,
code: Option<u16>,
- reason: Option<String>,
+ #[string] reason: Option<String>,
) -> Result<(), AnyError> {
let resource = state
.borrow_mut()
diff --git a/runtime/ops/web_worker.rs b/runtime/ops/web_worker.rs
index e62642fdd..b7b16ec1d 100644
--- a/runtime/ops/web_worker.rs
+++ b/runtime/ops/web_worker.rs
@@ -6,6 +6,7 @@ use crate::web_worker::WebWorkerInternalHandle;
use crate::web_worker::WebWorkerType;
use deno_core::error::AnyError;
use deno_core::op;
+use deno_core::op2;
use deno_core::CancelFuture;
use deno_core::OpState;
@@ -37,7 +38,8 @@ fn op_worker_post_message(
Ok(())
}
-#[op(deferred)]
+#[op2(async(lazy))]
+#[serde]
async fn op_worker_recv_message(
state: Rc<RefCell<OpState>>,
) -> Result<Option<JsMessageData>, AnyError> {