summaryrefslogtreecommitdiff
path: root/cli/ops
diff options
context:
space:
mode:
Diffstat (limited to 'cli/ops')
-rw-r--r--cli/ops/compiler.rs4
-rw-r--r--cli/ops/errors.rs4
-rw-r--r--cli/ops/os.rs14
-rw-r--r--cli/ops/repl.rs3
-rw-r--r--cli/ops/workers.rs53
5 files changed, 36 insertions, 42 deletions
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index 720eb65fc..e7d38f364 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -4,6 +4,7 @@ use crate::futures::future::join_all;
use crate::futures::Future;
use crate::ops::json_op;
use crate::state::ThreadSafeState;
+use deno::Loader;
use deno::*;
pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
@@ -36,7 +37,7 @@ fn op_cache(
let module_specifier = ModuleSpecifier::resolve_url(&args.module_id)
.expect("Should be valid module specifier");
- state.ts_compiler.cache_compiler_output(
+ state.global_state.ts_compiler.cache_compiler_output(
&module_specifier,
&args.extension,
&args.contents,
@@ -67,6 +68,7 @@ fn op_fetch_source_files(
let resolved_specifier =
state.resolve(specifier, &args.referrer, false, is_dyn_import)?;
let fut = state
+ .global_state
.file_fetcher
.fetch_source_file_async(&resolved_specifier);
futures.push(fut);
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs
index 2d786b97d..3d94c05c4 100644
--- a/cli/ops/errors.rs
+++ b/cli/ops/errors.rs
@@ -30,7 +30,7 @@ fn op_format_error(
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
let args: FormatErrorArgs = serde_json::from_value(args)?;
- let error = JSError::from_json(&args.error, &state.ts_compiler);
+ let error = JSError::from_json(&args.error, &state.global_state.ts_compiler);
Ok(JsonOp::Sync(json!({
"error": error.to_string(),
@@ -57,7 +57,7 @@ fn op_apply_source_map(
args.line.into(),
args.column.into(),
&mut mappings_map,
- &state.ts_compiler,
+ &state.global_state.ts_compiler,
);
Ok(JsonOp::Sync(json!({
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
index c50b8eedb..78fd940de 100644
--- a/cli/ops/os.rs
+++ b/cli/ops/os.rs
@@ -7,7 +7,6 @@ use crate::state::ThreadSafeState;
use crate::version;
use atty;
use deno::*;
-use log;
use std::collections::HashMap;
use std::env;
use sys_info;
@@ -40,16 +39,15 @@ fn op_start(
_args: Value,
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
+ let gs = &state.global_state;
+
Ok(JsonOp::Sync(json!({
"cwd": deno_fs::normalize_path(&env::current_dir().unwrap()),
"pid": std::process::id(),
- "argv": state.argv,
- "mainModule": state.main_module().map(|x| x.as_str().to_string()),
- "debugFlag": state
- .flags
- .log_level
- .map_or(false, |l| l == log::Level::Debug),
- "versionFlag": state.flags.version,
+ "argv": gs.argv,
+ "mainModule": gs.main_module.as_ref().map(|x| x.to_string()),
+ "debugFlag": gs.flags.log_level.map_or(false, |l| l == log::Level::Debug),
+ "versionFlag": gs.flags.version,
"v8Version": version::v8(),
"denoVersion": version::DENO,
"tsVersion": version::TYPESCRIPT,
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index 6644ab159..4a3ba68d4 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -44,7 +44,8 @@ fn op_repl_start(
let args: ReplStartArgs = serde_json::from_value(args)?;
debug!("op_repl_start {}", args.history_file);
- let history_path = repl::history_path(&state.dir, &args.history_file);
+ let history_path =
+ repl::history_path(&state.global_state.dir, &args.history_file);
let repl = repl::Repl::new(history_path);
let resource = ReplResource(Arc::new(Mutex::new(repl)));
let mut table = resources::lock_resource_table();
diff --git a/cli/ops/workers.rs b/cli/ops/workers.rs
index 809aa5d9b..f6dcf8042 100644
--- a/cli/ops/workers.rs
+++ b/cli/ops/workers.rs
@@ -4,7 +4,6 @@ use crate::deno_error::js_check;
use crate::deno_error::DenoError;
use crate::deno_error::ErrorKind;
use crate::ops::json_op;
-use crate::resources;
use crate::startup_data;
use crate::state::ThreadSafeState;
use crate::worker::Worker;
@@ -12,6 +11,7 @@ use deno::*;
use futures;
use futures::Async;
use futures::Future;
+use futures::IntoFuture;
use futures::Sink;
use futures::Stream;
use std;
@@ -48,18 +48,17 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
}
struct GetMessageFuture {
- pub state: ThreadSafeState,
+ state: ThreadSafeState,
}
impl Future for GetMessageFuture {
type Item = Option<Buf>;
- type Error = ();
+ type Error = ErrBox;
fn poll(&mut self) -> Result<Async<Self::Item>, Self::Error> {
- let mut wc = self.state.worker_channels.lock().unwrap();
- wc.1
- .poll()
- .map_err(|err| panic!("worker_channel recv err {:?}", err))
+ let mut channels = self.state.worker_channels.lock().unwrap();
+ let receiver = &mut channels.receiver;
+ receiver.poll().map_err(ErrBox::from)
}
}
@@ -93,12 +92,10 @@ fn op_worker_post_message(
data: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
let d = Vec::from(data.unwrap().as_ref()).into_boxed_slice();
-
- let tx = {
- let wc = state.worker_channels.lock().unwrap();
- wc.0.clone()
- };
- tx.send(d)
+ let mut channels = state.worker_channels.lock().unwrap();
+ let sender = &mut channels.sender;
+ sender
+ .send(d)
.wait()
.map_err(|e| DenoError::new(ErrorKind::Other, e.to_string()))?;
@@ -132,28 +129,23 @@ fn op_create_worker(
let parent_state = state.clone();
+ // TODO(bartlomieju): Isn't this wrong?
let mut module_specifier = ModuleSpecifier::resolve_url_or_path(specifier)?;
-
- let mut child_argv = parent_state.argv.clone();
-
if !has_source_code {
- if let Some(module) = state.main_module() {
- module_specifier =
- ModuleSpecifier::resolve_import(specifier, &module.to_string())?;
- child_argv[1] = module_specifier.to_string();
+ if let Some(referrer) = parent_state.main_module.as_ref() {
+ let referrer = referrer.clone().to_string();
+ module_specifier = ModuleSpecifier::resolve_import(specifier, &referrer)?;
}
}
let child_state = ThreadSafeState::new(
- parent_state.flags.clone(),
- child_argv,
- parent_state.progress.clone(),
+ state.global_state.clone(),
+ Some(module_specifier.clone()),
include_deno_namespace,
)?;
- let rid = child_state.resource.rid;
+ let rid = child_state.rid;
let name = format!("USER-WORKER-{}", specifier);
let deno_main_call = format!("denoMain({})", include_deno_namespace);
-
let mut worker =
Worker::new(name, startup_data::deno_isolate_init(), child_state);
js_check(worker.execute(&deno_main_call));
@@ -201,9 +193,8 @@ fn op_host_get_worker_closed(
worker.clone()
};
- let op = Box::new(
- shared_worker_future.then(move |_result| futures::future::ok(json!({}))),
- );
+ let op =
+ shared_worker_future.then(move |_result| futures::future::ok(json!({})));
Ok(JsonOp::Async(Box::new(op)))
}
@@ -222,7 +213,7 @@ fn op_host_get_message(
let args: HostGetMessageArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
- let op = resources::get_message_from_worker(rid)
+ let op = Worker::get_message_from_resource(rid)
.map_err(move |_| -> ErrBox { unimplemented!() })
.and_then(move |maybe_buf| {
futures::future::ok(json!({
@@ -250,7 +241,9 @@ fn op_host_post_message(
let d = Vec::from(data.unwrap().as_ref()).into_boxed_slice();
- resources::post_message_to_worker(rid, d)?
+ // TODO: rename to post_message_to_child(rid, d)
+ Worker::post_message_to_resource(rid, d)
+ .into_future()
.wait()
.map_err(|e| DenoError::new(ErrorKind::Other, e.to_string()))?;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 18:56:08 +0000