From b657d743a22802b8232fbf558f2f00bf2942096f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sun, 20 Sep 2020 01:17:35 +0200 Subject: refactor: remove CliState, use OpState, add CliModuleLoader (#7588) - remove "CliState.workers" and "CliState.next_worker_id", instead store them on "OpState" using type aliases. - remove "CliState.global_timer" and "CliState.start_time", instead store them on "OpState" using type aliases. - remove "CliState.is_internal", instead pass it to Worker::new - move "CliState::permissions" to "OpState" - move "CliState::main_module" to "OpState" - move "CliState::global_state" to "OpState" - move "CliState::check_unstable()" to "GlobalState" - change "cli_state()" to "global_state()" - change "deno_core::ModuleLoader" trait to pass "OpState" to callbacks - rename "CliState" to "CliModuleLoader" --- cli/ops/websocket.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'cli/ops/websocket.rs') diff --git a/cli/ops/websocket.rs b/cli/ops/websocket.rs index 5126b93c0..e16ce258c 100644 --- a/cli/ops/websocket.rs +++ b/cli/ops/websocket.rs @@ -1,5 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +use crate::permissions::Permissions; use core::task::Poll; use deno_core::error::bad_resource_id; use deno_core::error::type_error; @@ -55,10 +56,14 @@ pub async fn op_ws_create( _bufs: BufVec, ) -> Result { let args: CreateArgs = serde_json::from_value(args)?; + { + let s = state.borrow(); + s.borrow::() + .check_net_url(&url::Url::parse(&args.url)?)?; + } let ca_file = { - let cli_state = super::cli_state2(&state); - cli_state.check_net_url(&url::Url::parse(&args.url)?)?; - cli_state.global_state.flags.ca_file.clone() + let cli_state = super::global_state2(&state); + cli_state.flags.ca_file.clone() }; let uri: Uri = args.url.parse()?; let request = Request::builder() -- cgit v1.2.3