diff options
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/Cargo.toml | 2 | ||||
-rw-r--r-- | runtime/build.rs | 12 | ||||
-rw-r--r-- | runtime/js/90_deno_ns.js | 2 | ||||
-rw-r--r-- | runtime/lib.rs | 1 | ||||
-rw-r--r-- | runtime/ops/http.rs | 19 | ||||
-rw-r--r-- | runtime/permissions/mod.rs | 11 | ||||
-rw-r--r-- | runtime/web_worker.rs | 1 | ||||
-rw-r--r-- | runtime/worker.rs | 1 |
8 files changed, 1 insertions, 48 deletions
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 13bbfa34b..01675c120 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -41,7 +41,6 @@ deno_core.workspace = true deno_crypto.workspace = true deno_fetch.workspace = true deno_ffi.workspace = true -deno_flash.workspace = true deno_fs.workspace = true deno_http.workspace = true deno_io.workspace = true @@ -68,7 +67,6 @@ deno_core.workspace = true deno_crypto.workspace = true deno_fetch.workspace = true deno_ffi.workspace = true -deno_flash.workspace = true deno_fs.workspace = true deno_http.workspace = true deno_io.workspace = true diff --git a/runtime/build.rs b/runtime/build.rs index abdd0e584..809e32a76 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -120,16 +120,6 @@ mod startup_snapshot { } } - impl deno_flash::FlashPermissions for Permissions { - fn check_net<T: AsRef<str>>( - &mut self, - _host: &(T, Option<u16>), - _api_name: &str, - ) -> Result<(), deno_core::error::AnyError> { - unreachable!("snapshotting!") - } - } - impl deno_node::NodePermissions for Permissions { fn check_read( &mut self, @@ -244,7 +234,6 @@ mod startup_snapshot { deno_net, deno_napi, deno_http, - deno_flash, deno_io, deno_fs ], @@ -322,7 +311,6 @@ mod startup_snapshot { deno_http::deno_http::init_ops_and_esm(), deno_io::deno_io::init_ops_and_esm(Default::default()), deno_fs::deno_fs::init_ops_and_esm::<Permissions>(false), - deno_flash::deno_flash::init_ops_and_esm::<Permissions>(false), // No --unstable runtime::init_ops_and_esm(), // FIXME(bartlomieju): these extensions are specified last, because they // depend on `runtime`, even though it should be other way around diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js index 1eb479114..bb6ba3b08 100644 --- a/runtime/js/90_deno_ns.js +++ b/runtime/js/90_deno_ns.js @@ -9,7 +9,6 @@ import * as ffi from "ext:deno_ffi/00_ffi.js"; import * as net from "ext:deno_net/01_net.js"; import * as tls from "ext:deno_net/02_tls.js"; import * as http from "ext:deno_http/01_http.js"; -import * as flash from "ext:deno_flash/01_http.js"; import * as errors from "ext:runtime/01_errors.js"; import * as version from "ext:runtime/01_version.ts"; import * as permissions from "ext:runtime/10_permissions.js"; @@ -172,7 +171,6 @@ const denoNsUnstable = { funlock: fs.funlock, funlockSync: fs.funlockSync, upgradeHttp: http.upgradeHttp, - upgradeHttpRaw: flash.upgradeHttpRaw, serve: http.serve, openKv: kv.openKv, Kv: kv.Kv, diff --git a/runtime/lib.rs b/runtime/lib.rs index 994e043fd..6745c4a56 100644 --- a/runtime/lib.rs +++ b/runtime/lib.rs @@ -7,7 +7,6 @@ pub use deno_core; pub use deno_crypto; pub use deno_fetch; pub use deno_ffi; -pub use deno_flash; pub use deno_fs; pub use deno_http; pub use deno_io; diff --git a/runtime/ops/http.rs b/runtime/ops/http.rs index 3a316d800..767fc3ae0 100644 --- a/runtime/ops/http.rs +++ b/runtime/ops/http.rs @@ -29,7 +29,7 @@ use tokio::net::UnixStream; deno_core::extension!( deno_http_runtime, - ops = [op_http_start, op_http_upgrade, op_flash_upgrade_http], + ops = [op_http_start, op_http_upgrade], customizer = |ext: &mut deno_core::ExtensionBuilder| { ext.force_op_registration(); }, @@ -91,23 +91,6 @@ fn op_http_start( Err(bad_resource_id()) } -#[op] -fn op_flash_upgrade_http( - state: &mut OpState, - token: u32, - server_id: u32, -) -> Result<deno_core::ResourceId, AnyError> { - let flash_ctx = state.borrow_mut::<deno_flash::FlashContext>(); - let ctx = flash_ctx.servers.get_mut(&server_id).unwrap(); - - let tcp_stream = deno_flash::detach_socket(ctx, token)?; - Ok( - state - .resource_table - .add(TcpStreamResource::new(tcp_stream.into_split())), - ) -} - #[derive(Serialize)] #[serde(rename_all = "camelCase")] pub struct HttpUpgradeResult { diff --git a/runtime/permissions/mod.rs b/runtime/permissions/mod.rs index 2093b08f9..7e1772ee3 100644 --- a/runtime/permissions/mod.rs +++ b/runtime/permissions/mod.rs @@ -1826,17 +1826,6 @@ impl PermissionsContainer { } } -impl deno_flash::FlashPermissions for PermissionsContainer { - #[inline(always)] - fn check_net<T: AsRef<str>>( - &mut self, - host: &(T, Option<u16>), - api_name: &str, - ) -> Result<(), AnyError> { - self.0.lock().net.check(host, Some(api_name)) - } -} - impl deno_node::NodePermissions for PermissionsContainer { #[inline(always)] fn check_read(&mut self, path: &Path) -> Result<(), AnyError> { diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 399b22912..8bd5cf21e 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -440,7 +440,6 @@ impl WebWorker { deno_http::deno_http::init_ops(), deno_io::deno_io::init_ops(Some(options.stdio)), deno_fs::deno_fs::init_ops::<PermissionsContainer>(unstable), - deno_flash::deno_flash::init_ops::<PermissionsContainer>(unstable), deno_node::deno_node::init_ops::<crate::RuntimeNodeEnv>( options.npm_resolver, ), diff --git a/runtime/worker.rs b/runtime/worker.rs index 296e9c4b1..48bf7b09f 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -264,7 +264,6 @@ impl MainWorker { deno_http::deno_http::init_ops(), deno_io::deno_io::init_ops(Some(options.stdio)), deno_fs::deno_fs::init_ops::<PermissionsContainer>(unstable), - deno_flash::deno_flash::init_ops::<PermissionsContainer>(unstable), deno_node::deno_node::init_ops::<crate::RuntimeNodeEnv>( options.npm_resolver, ), |