refactor: merge deno_broadcast_channel into deno_web

Cargo.toml

@@ -8,7 +8,6 @@ members = [
   "cli/lib",
   "cli/rt",
   "cli/snapshot",
-  "ext/broadcast_channel",
   "ext/bundle",
   "ext/canvas",
   "ext/cron",
@@ -86,7 +85,6 @@ denokv_remote = "0.12.0"
 denokv_sqlite = { default-features = false, version = "0.12.0" }
 
 # exts
-deno_broadcast_channel = { version = "0.215.0", path = "./ext/broadcast_channel" }
 deno_bundle_runtime = { version = "0.8.0", path = "./ext/bundle" }
 deno_canvas = { version = "0.90.0", path = "./ext/canvas" }
 deno_cron = { version = "0.101.0", path = "./ext/cron" }
@@ -438,8 +436,6 @@ opt-level = 3
 opt-level = 3
 [profile.release.package.deno_bench_util]
 opt-level = 3
-[profile.release.package.deno_broadcast_channel]
-opt-level = 3
 [profile.release.package.deno_core]
 opt-level = 3
 [profile.release.package.deno_crypto]

cli/lib/worker.rs

@@ -18,7 +18,6 @@ use deno_runtime::UNSTABLE_FEATURES;
 use deno_runtime::WorkerExecutionMode;
 use deno_runtime::WorkerLogLevel;
 use deno_runtime::colors;
-use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
 use deno_runtime::deno_core;
 use deno_runtime::deno_core::CompiledWasmModuleStore;
 use deno_runtime::deno_core::Extension;
@@ -38,6 +37,7 @@ use deno_runtime::deno_process::NpmProcessStateProviderRc;
 use deno_runtime::deno_telemetry::OtelConfig;
 use deno_runtime::deno_tls::RootCertStoreProvider;
 use deno_runtime::deno_web::BlobStore;
+use deno_runtime::deno_web::InMemoryBroadcastChannel;
 use deno_runtime::fmt_errors::format_js_error;
 use deno_runtime::inspector_server::InspectorServer;
 use deno_runtime::ops::worker_host::CreateWebWorkerCb;

ext/broadcast_channel/Cargo.toml

@@ -2,22 +2,13 @@
 
 [package]
 name = "deno_broadcast_channel"
-version = "0.215.0"
+version = "0.216.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
 readme = "README.md"
 repository.workspace = true
-description = "Implementation of BroadcastChannel API for Deno"
+description = "DEPRECATED: Use deno_web instead"
 
 [lib]
 path = "lib.rs"
-
-[dependencies]
-async-trait.workspace = true
-deno_core.workspace = true
-deno_error.workspace = true
-deno_features.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-uuid.workspace = true

ext/broadcast_channel/README.md

@@ -1,5 +1,4 @@
-# deno_broadcast_channel
+# deno_cache
 
-This crate implements the BroadcastChannel functions of Deno.
-
-Spec: https://html.spec.whatwg.org/multipage/web-messaging.html
+This crate has been deprecated, use
+[deno_web](https://crates.io/crates/deno_web) instead.

ext/broadcast_channel/lib.rs

@@ -1,163 +1 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
-
-mod in_memory_broadcast_channel;
-
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use deno_core::JsBuffer;
-use deno_core::OpState;
-use deno_core::Resource;
-use deno_core::ResourceId;
-use deno_core::op2;
-use deno_error::JsErrorBox;
-use deno_features::FeatureChecker;
-pub use in_memory_broadcast_channel::InMemoryBroadcastChannel;
-pub use in_memory_broadcast_channel::InMemoryBroadcastChannelResource;
-use tokio::sync::broadcast::error::SendError as BroadcastSendError;
-use tokio::sync::mpsc::error::SendError as MpscSendError;
-
-pub const UNSTABLE_FEATURE_NAME: &str = "broadcast-channel";
-
-#[derive(Debug, thiserror::Error, deno_error::JsError)]
-pub enum BroadcastChannelError {
-  #[class(inherit)]
-  #[error(transparent)]
-  Resource(
-    #[from]
-    #[inherit]
-    deno_core::error::ResourceError,
-  ),
-  #[class(generic)]
-  #[error(transparent)]
-  MPSCSendError(MpscSendError<Box<dyn std::fmt::Debug + Send + Sync>>),
-  #[class(generic)]
-  #[error(transparent)]
-  BroadcastSendError(
-    BroadcastSendError<Box<dyn std::fmt::Debug + Send + Sync>>,
-  ),
-  #[class(inherit)]
-  #[error(transparent)]
-  Other(#[inherit] JsErrorBox),
-}
-
-impl<T: std::fmt::Debug + Send + Sync + 'static> From<MpscSendError<T>>
-  for BroadcastChannelError
-{
-  fn from(value: MpscSendError<T>) -> Self {
-    BroadcastChannelError::MPSCSendError(MpscSendError(Box::new(value.0)))
-  }
-}
-impl<T: std::fmt::Debug + Send + Sync + 'static> From<BroadcastSendError<T>>
-  for BroadcastChannelError
-{
-  fn from(value: BroadcastSendError<T>) -> Self {
-    BroadcastChannelError::BroadcastSendError(BroadcastSendError(Box::new(
-      value.0,
-    )))
-  }
-}
-
-#[async_trait]
-pub trait BroadcastChannel: Clone {
-  type Resource: Resource;
-
-  fn subscribe(&self) -> Result<Self::Resource, BroadcastChannelError>;
-
-  fn unsubscribe(
-    &self,
-    resource: &Self::Resource,
-  ) -> Result<(), BroadcastChannelError>;
-
-  async fn send(
-    &self,
-    resource: &Self::Resource,
-    name: String,
-    data: Vec<u8>,
-  ) -> Result<(), BroadcastChannelError>;
-
-  async fn recv(
-    &self,
-    resource: &Self::Resource,
-  ) -> Result<Option<Message>, BroadcastChannelError>;
-}
-
-pub type Message = (String, Vec<u8>);
-
-#[op2(fast)]
-#[smi]
-pub fn op_broadcast_subscribe<BC>(
-  state: &mut OpState,
-) -> Result<ResourceId, BroadcastChannelError>
-where
-  BC: BroadcastChannel + 'static,
-{
-  state
-    .borrow::<Arc<FeatureChecker>>()
-    .check_or_exit(UNSTABLE_FEATURE_NAME, "BroadcastChannel");
-  let bc = state.borrow::<BC>();
-  let resource = bc.subscribe()?;
-  Ok(state.resource_table.add(resource))
-}
-
-#[op2(fast)]
-pub fn op_broadcast_unsubscribe<BC>(
-  state: &mut OpState,
-  #[smi] rid: ResourceId,
-) -> Result<(), BroadcastChannelError>
-where
-  BC: BroadcastChannel + 'static,
-{
-  let resource = state.resource_table.get::<BC::Resource>(rid)?;
-  let bc = state.borrow::<BC>();
-  bc.unsubscribe(&resource)
-}
-
-#[op2(async)]
-pub async fn op_broadcast_send<BC>(
-  state: Rc<RefCell<OpState>>,
-  #[smi] rid: ResourceId,
-  #[string] name: String,
-  #[buffer] buf: JsBuffer,
-) -> Result<(), BroadcastChannelError>
-where
-  BC: BroadcastChannel + 'static,
-{
-  let resource = state.borrow().resource_table.get::<BC::Resource>(rid)?;
-  let bc = state.borrow().borrow::<BC>().clone();
-  bc.send(&resource, name, buf.to_vec()).await
-}
-
-#[op2(async)]
-#[serde]
-pub async fn op_broadcast_recv<BC>(
-  state: Rc<RefCell<OpState>>,
-  #[smi] rid: ResourceId,
-) -> Result<Option<Message>, BroadcastChannelError>
-where
-  BC: BroadcastChannel + 'static,
-{
-  let resource = state.borrow().resource_table.get::<BC::Resource>(rid)?;
-  let bc = state.borrow().borrow::<BC>().clone();
-  bc.recv(&resource).await
-}
-
-deno_core::extension!(deno_broadcast_channel,
-  deps = [ deno_webidl, deno_web ],
-  parameters = [BC: BroadcastChannel],
-  ops = [
-    op_broadcast_subscribe<BC>,
-    op_broadcast_unsubscribe<BC>,
-    op_broadcast_send<BC>,
-    op_broadcast_recv<BC>,
-  ],
-  esm = [ "01_broadcast_channel.js" ],
-  options = {
-    bc: BC,
-  },
-  state = |state, options| {
-    state.put(options.bc);
-  },
-);

ext/node/polyfills/worker_threads.ts

@@ -26,7 +26,7 @@ import {
 import * as webidl from "ext:deno_webidl/00_webidl.js";
 import { notImplemented } from "ext:deno_node/_utils.ts";
 import { EventEmitter } from "node:events";
-import { BroadcastChannel } from "ext:deno_broadcast_channel/01_broadcast_channel.js";
+import { BroadcastChannel } from "ext:deno_web/01_broadcast_channel.js";
 import { untransferableSymbol } from "ext:deno_node/internal_binding/util.ts";
 import process from "node:process";
 import { createRequire } from "node:module";

ext/web/Cargo.toml

@@ -21,6 +21,7 @@ bytes.workspace = true
 chrono = { workspace = true, features = ["now"] }
 deno_core.workspace = true
 deno_error.workspace = true
+deno_features.workspace = true
 deno_permissions.workspace = true
 encoding_rs.workspace = true
 flate2 = { workspace = true, features = ["default"] }