2018-07-23 14:46:30 -04:00
|
|
|
// Copyright 2018 the Deno authors. All rights reserved. MIT license.
|
2018-09-18 14:53:16 -04:00
|
|
|
|
2018-09-27 00:56:39 -04:00
|
|
|
use errors;
|
2018-09-05 22:13:36 -04:00
|
|
|
use errors::DenoError;
|
2018-08-15 23:36:48 -04:00
|
|
|
use errors::DenoResult;
|
2018-08-26 05:51:25 -04:00
|
|
|
use fs as deno_fs;
|
2018-09-18 14:53:16 -04:00
|
|
|
use isolate::Buf;
|
2018-10-02 20:47:40 -04:00
|
|
|
use isolate::Isolate;
|
2018-09-18 14:53:16 -04:00
|
|
|
use isolate::IsolateState;
|
|
|
|
use isolate::Op;
|
|
|
|
use msg;
|
2018-10-05 12:16:24 -04:00
|
|
|
use resources;
|
|
|
|
use resources::Resource;
|
2018-10-03 23:58:29 -04:00
|
|
|
use tokio_util;
|
2018-09-18 14:53:16 -04:00
|
|
|
|
|
|
|
use flatbuffers::FlatBufferBuilder;
|
2018-08-09 15:17:08 -04:00
|
|
|
use futures;
|
2018-09-22 04:42:07 -04:00
|
|
|
use futures::future::poll_fn;
|
|
|
|
use futures::Poll;
|
2018-08-15 20:57:36 -04:00
|
|
|
use hyper;
|
|
|
|
use hyper::rt::{Future, Stream};
|
|
|
|
use hyper::Client;
|
2018-09-10 23:40:03 -04:00
|
|
|
use remove_dir_all::remove_dir_all;
|
2018-08-13 19:55:10 -04:00
|
|
|
use std;
|
2018-08-26 05:51:25 -04:00
|
|
|
use std::fs;
|
2018-10-05 12:16:24 -04:00
|
|
|
use std::net::{Shutdown, SocketAddr};
|
2018-09-12 10:28:48 -04:00
|
|
|
#[cfg(any(unix))]
|
|
|
|
use std::os::unix::fs::PermissionsExt;
|
2018-08-09 13:24:30 -04:00
|
|
|
use std::path::Path;
|
2018-09-22 04:42:07 -04:00
|
|
|
use std::path::PathBuf;
|
2018-10-03 23:58:29 -04:00
|
|
|
use std::str::FromStr;
|
2018-09-18 14:53:16 -04:00
|
|
|
use std::sync::Arc;
|
2018-08-30 13:54:56 -04:00
|
|
|
use std::time::UNIX_EPOCH;
|
2018-08-15 23:36:48 -04:00
|
|
|
use std::time::{Duration, Instant};
|
2018-09-27 00:56:39 -04:00
|
|
|
use tokio;
|
2018-10-03 23:58:29 -04:00
|
|
|
use tokio::net::TcpListener;
|
|
|
|
use tokio::net::TcpStream;
|
2018-10-01 19:43:27 -04:00
|
|
|
use tokio_io;
|
2018-09-22 04:42:07 -04:00
|
|
|
use tokio_threadpool;
|
2018-08-15 23:36:48 -04:00
|
|
|
|
2018-09-05 22:13:36 -04:00
|
|
|
type OpResult = DenoResult<Buf>;
|
|
|
|
|
|
|
|
// TODO Ideally we wouldn't have to box the Op being returned.
|
|
|
|
// The box is just to make it easier to get a prototype refactor working.
|
2018-10-03 20:48:02 -04:00
|
|
|
type OpCreator =
|
2018-09-27 17:33:10 -04:00
|
|
|
fn(state: Arc<IsolateState>, base: &msg::Base, data: &'static mut [u8])
|
|
|
|
-> Box<Op>;
|
2018-07-06 11:27:36 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
// Hopefully Rust optimizes this away.
|
|
|
|
fn empty_buf() -> Buf {
|
|
|
|
Box::new([])
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:51:20 -04:00
|
|
|
/// Processes raw messages from JavaScript.
|
|
|
|
/// This functions invoked every time libdeno.send() is called.
|
|
|
|
/// control corresponds to the first argument of libdeno.send().
|
|
|
|
/// data corresponds to the second argument of libdeno.send().
|
|
|
|
pub fn dispatch(
|
2018-10-02 20:47:40 -04:00
|
|
|
isolate: &mut Isolate,
|
2018-09-27 17:33:10 -04:00
|
|
|
control: &[u8],
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> (bool, Box<Op>) {
|
|
|
|
let base = msg::get_root_as_base(control);
|
2018-09-18 14:53:16 -04:00
|
|
|
let is_sync = base.sync();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner_type = base.inner_type();
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-02 20:47:40 -04:00
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let op: Box<Op> = if inner_type == msg::Any::SetTimeout {
|
2018-10-02 20:47:40 -04:00
|
|
|
// SetTimeout is an exceptional op: the global timeout field is part of the
|
|
|
|
// Isolate state (not the IsolateState state) and it must be updated on the
|
|
|
|
// main thread.
|
|
|
|
assert_eq!(is_sync, true);
|
2018-10-03 20:48:02 -04:00
|
|
|
op_set_timeout(isolate, &base, data)
|
2018-10-02 20:47:40 -04:00
|
|
|
} else {
|
|
|
|
// Handle regular ops.
|
2018-10-03 21:12:23 -04:00
|
|
|
let op_creator: OpCreator = match inner_type {
|
2018-10-03 20:48:02 -04:00
|
|
|
msg::Any::Start => op_start,
|
|
|
|
msg::Any::CodeFetch => op_code_fetch,
|
|
|
|
msg::Any::CodeCache => op_code_cache,
|
|
|
|
msg::Any::Environ => op_env,
|
|
|
|
msg::Any::FetchReq => op_fetch_req,
|
|
|
|
msg::Any::MakeTempDir => op_make_temp_dir,
|
|
|
|
msg::Any::Mkdir => op_mkdir,
|
|
|
|
msg::Any::Open => op_open,
|
|
|
|
msg::Any::Read => op_read,
|
|
|
|
msg::Any::Write => op_write,
|
|
|
|
msg::Any::Close => op_close,
|
2018-10-05 12:16:24 -04:00
|
|
|
msg::Any::Shutdown => op_shutdown,
|
2018-10-03 20:48:02 -04:00
|
|
|
msg::Any::Remove => op_remove,
|
|
|
|
msg::Any::ReadFile => op_read_file,
|
|
|
|
msg::Any::ReadDir => op_read_dir,
|
|
|
|
msg::Any::Rename => op_rename,
|
|
|
|
msg::Any::Readlink => op_read_link,
|
|
|
|
msg::Any::Symlink => op_symlink,
|
|
|
|
msg::Any::SetEnv => op_set_env,
|
|
|
|
msg::Any::Stat => op_stat,
|
|
|
|
msg::Any::Truncate => op_truncate,
|
|
|
|
msg::Any::WriteFile => op_write_file,
|
|
|
|
msg::Any::Exit => op_exit,
|
|
|
|
msg::Any::CopyFile => op_copy_file,
|
|
|
|
msg::Any::Listen => op_listen,
|
|
|
|
msg::Any::Accept => op_accept,
|
|
|
|
msg::Any::Dial => op_dial,
|
2018-10-02 20:47:40 -04:00
|
|
|
_ => panic!(format!(
|
|
|
|
"Unhandled message {}",
|
2018-10-03 21:12:23 -04:00
|
|
|
msg::enum_name_any(inner_type)
|
2018-10-02 20:47:40 -04:00
|
|
|
)),
|
|
|
|
};
|
2018-10-03 20:48:02 -04:00
|
|
|
op_creator(isolate.state.clone(), &base, data)
|
2018-08-15 23:36:48 -04:00
|
|
|
};
|
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
let boxed_op = Box::new(
|
|
|
|
op.or_else(move |err: DenoError| -> DenoResult<Buf> {
|
|
|
|
debug!("op err {}", err);
|
|
|
|
// No matter whether we got an Err or Ok, we want a serialized message to
|
|
|
|
// send back. So transform the DenoError into a deno_buf.
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
let errmsg_offset = builder.create_string(&format!("{}", err));
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
|
|
|
error: Some(errmsg_offset),
|
|
|
|
error_kind: err.kind(),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
}).and_then(move |buf: Buf| -> DenoResult<Buf> {
|
|
|
|
// Handle empty responses. For sync responses we just want
|
|
|
|
// to send null. For async we want to send a small message
|
|
|
|
// with the cmd_id.
|
|
|
|
let buf = if is_sync || buf.len() > 0 {
|
|
|
|
buf
|
|
|
|
} else {
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
)
|
2018-09-05 22:13:36 -04:00
|
|
|
};
|
2018-09-18 14:53:16 -04:00
|
|
|
Ok(buf)
|
|
|
|
}),
|
|
|
|
);
|
2018-08-15 23:36:48 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
debug!(
|
|
|
|
"msg_from_js {} sync {}",
|
2018-10-03 21:12:23 -04:00
|
|
|
msg::enum_name_any(inner_type),
|
2018-09-18 14:53:16 -04:00
|
|
|
base.sync()
|
|
|
|
);
|
|
|
|
return (base.sync(), boxed_op);
|
2018-07-13 03:24:07 -04:00
|
|
|
}
|
|
|
|
|
2018-09-05 22:13:36 -04:00
|
|
|
fn permission_denied() -> DenoError {
|
|
|
|
DenoError::from(std::io::Error::new(
|
|
|
|
std::io::ErrorKind::PermissionDenied,
|
|
|
|
"permission denied",
|
|
|
|
))
|
|
|
|
}
|
|
|
|
|
2018-09-19 00:38:24 -04:00
|
|
|
fn not_implemented() -> DenoError {
|
|
|
|
DenoError::from(std::io::Error::new(
|
|
|
|
std::io::ErrorKind::Other,
|
2018-09-24 19:51:37 -04:00
|
|
|
"Not implemented",
|
2018-09-19 00:38:24 -04:00
|
|
|
))
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_exit(
|
2018-09-27 17:33:10 -04:00
|
|
|
_config: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
_data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_exit().unwrap();
|
|
|
|
std::process::exit(inner.code())
|
2018-09-02 02:33:24 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_start(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-09-05 22:13:36 -04:00
|
|
|
let mut builder = FlatBufferBuilder::new();
|
2018-08-13 19:55:10 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
let argv = state.argv.iter().map(|s| s.as_str()).collect::<Vec<_>>();
|
2018-08-13 19:55:10 -04:00
|
|
|
let argv_off = builder.create_vector_of_strings(argv.as_slice());
|
|
|
|
|
|
|
|
let cwd_path = std::env::current_dir().unwrap();
|
2018-08-23 03:58:59 -04:00
|
|
|
let cwd_off =
|
2018-08-26 05:51:25 -04:00
|
|
|
builder.create_string(deno_fs::normalize_path(cwd_path.as_ref()).as_ref());
|
2018-08-13 19:55:10 -04:00
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::StartRes::create(
|
2018-09-05 22:13:36 -04:00
|
|
|
&mut builder,
|
2018-08-13 19:55:10 -04:00
|
|
|
&msg::StartResArgs {
|
|
|
|
cwd: Some(cwd_off),
|
|
|
|
argv: Some(argv_off),
|
2018-09-18 14:53:16 -04:00
|
|
|
debug_flag: state.flags.log_debug,
|
|
|
|
recompile_flag: state.flags.recompile,
|
2018-08-13 19:55:10 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
2018-09-09 19:48:10 -04:00
|
|
|
ok_future(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
base.cmd_id(),
|
|
|
|
&mut builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner_type: msg::Any::StartRes,
|
|
|
|
inner: Some(inner.as_union_value()),
|
2018-08-13 19:55:10 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
2018-08-15 23:36:48 -04:00
|
|
|
))
|
2018-07-23 14:13:12 -04:00
|
|
|
}
|
|
|
|
|
2018-09-09 19:48:10 -04:00
|
|
|
fn serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id: u32,
|
2018-08-15 23:36:48 -04:00
|
|
|
builder: &mut FlatBufferBuilder,
|
2018-09-05 22:13:36 -04:00
|
|
|
mut args: msg::BaseArgs,
|
|
|
|
) -> Buf {
|
|
|
|
args.cmd_id = cmd_id;
|
2018-08-17 15:11:28 -04:00
|
|
|
let base = msg::Base::create(builder, &args);
|
|
|
|
msg::finish_base_buffer(builder, base);
|
2018-09-02 01:58:23 -04:00
|
|
|
let data = builder.finished_data();
|
2018-09-09 19:48:10 -04:00
|
|
|
// println!("serialize_response {:x?}", data);
|
2018-09-05 22:13:36 -04:00
|
|
|
let vec = data.to_vec();
|
2018-09-18 14:53:16 -04:00
|
|
|
vec.into_boxed_slice()
|
2018-08-09 15:17:08 -04:00
|
|
|
}
|
|
|
|
|
2018-09-05 22:13:36 -04:00
|
|
|
fn ok_future(buf: Buf) -> Box<Op> {
|
|
|
|
Box::new(futures::future::ok(buf))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Shout out to Earl Sweatshirt.
|
|
|
|
fn odd_future(err: DenoError) -> Box<Op> {
|
|
|
|
Box::new(futures::future::err(err))
|
2018-08-09 15:17:08 -04:00
|
|
|
}
|
|
|
|
|
2018-09-17 20:41:13 -04:00
|
|
|
// https://github.com/denoland/isolate/blob/golang/os.go#L100-L154
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_code_fetch(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_code_fetch().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let module_specifier = inner.module_specifier().unwrap();
|
|
|
|
let containing_file = inner.containing_file().unwrap();
|
2018-07-19 21:14:32 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
assert_eq!(state.dir.root.join("gen"), state.dir.gen, "Sanity check");
|
2018-07-06 11:27:36 -04:00
|
|
|
|
2018-09-05 22:13:36 -04:00
|
|
|
Box::new(futures::future::result(|| -> OpResult {
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-09-18 14:53:16 -04:00
|
|
|
let out = state.dir.code_fetch(module_specifier, containing_file)?;
|
2018-09-05 22:13:36 -04:00
|
|
|
let mut msg_args = msg::CodeFetchResArgs {
|
|
|
|
module_name: Some(builder.create_string(&out.module_name)),
|
|
|
|
filename: Some(builder.create_string(&out.filename)),
|
|
|
|
source_code: Some(builder.create_string(&out.source_code)),
|
2018-08-15 23:36:48 -04:00
|
|
|
..Default::default()
|
2018-09-05 22:13:36 -04:00
|
|
|
};
|
|
|
|
match out.maybe_output_code {
|
|
|
|
Some(ref output_code) => {
|
|
|
|
msg_args.output_code = Some(builder.create_string(output_code));
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
};
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::CodeFetchRes::create(builder, &msg_args);
|
2018-09-09 19:48:10 -04:00
|
|
|
Ok(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::CodeFetchRes,
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
}()))
|
2018-07-13 03:24:07 -04:00
|
|
|
}
|
|
|
|
|
2018-09-17 20:41:13 -04:00
|
|
|
// https://github.com/denoland/isolate/blob/golang/os.go#L156-L169
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_code_cache(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_code_cache().unwrap();
|
|
|
|
let filename = inner.filename().unwrap();
|
|
|
|
let source_code = inner.source_code().unwrap();
|
|
|
|
let output_code = inner.output_code().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
Box::new(futures::future::result(|| -> OpResult {
|
2018-09-18 14:53:16 -04:00
|
|
|
state.dir.code_cache(filename, source_code, output_code)?;
|
|
|
|
Ok(empty_buf())
|
2018-09-05 22:13:36 -04:00
|
|
|
}()))
|
2018-07-06 11:27:36 -04:00
|
|
|
}
|
2018-08-09 15:17:08 -04:00
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_set_timeout(
|
2018-10-02 20:47:40 -04:00
|
|
|
isolate: &mut Isolate,
|
2018-09-27 17:33:10 -04:00
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_set_timeout().unwrap();
|
|
|
|
let val = inner.timeout() as i64;
|
2018-10-02 20:47:40 -04:00
|
|
|
isolate.timeout_due = if val >= 0 {
|
|
|
|
Some(Instant::now() + Duration::from_millis(val as u64))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
2018-09-24 22:46:36 -04:00
|
|
|
ok_future(empty_buf())
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_set_env(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_set_env().unwrap();
|
|
|
|
let key = inner.key().unwrap();
|
|
|
|
let value = inner.value().unwrap();
|
2018-09-02 02:33:24 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_env {
|
2018-09-05 22:13:36 -04:00
|
|
|
return odd_future(permission_denied());
|
2018-08-31 07:51:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
std::env::set_var(key, value);
|
2018-09-18 14:53:16 -04:00
|
|
|
ok_future(empty_buf())
|
2018-08-31 07:51:12 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_env(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-09-18 14:53:16 -04:00
|
|
|
|
|
|
|
if !state.flags.allow_env {
|
2018-09-05 22:13:36 -04:00
|
|
|
return odd_future(permission_denied());
|
2018-08-31 07:51:12 -04:00
|
|
|
}
|
|
|
|
|
2018-09-05 22:13:36 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-09-02 01:59:16 -04:00
|
|
|
let vars: Vec<_> = std::env::vars()
|
|
|
|
.map(|(key, value)| {
|
|
|
|
let key = builder.create_string(&key);
|
|
|
|
let value = builder.create_string(&value);
|
2018-08-31 07:51:12 -04:00
|
|
|
|
2018-09-02 01:59:16 -04:00
|
|
|
msg::EnvPair::create(
|
|
|
|
builder,
|
|
|
|
&msg::EnvPairArgs {
|
|
|
|
key: Some(key),
|
|
|
|
value: Some(value),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
)
|
2018-09-17 20:41:13 -04:00
|
|
|
}).collect();
|
2018-09-02 01:58:23 -04:00
|
|
|
let tables = builder.create_vector(&vars);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::EnvironRes::create(
|
2018-08-31 07:51:12 -04:00
|
|
|
builder,
|
|
|
|
&msg::EnvironResArgs {
|
|
|
|
map: Some(tables),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
2018-09-09 19:48:10 -04:00
|
|
|
ok_future(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id,
|
2018-08-31 07:51:12 -04:00
|
|
|
builder,
|
2018-09-05 22:13:36 -04:00
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::EnvironRes,
|
2018-08-31 07:51:12 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_fetch_req(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_fetch_req().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let id = inner.id();
|
|
|
|
let url = inner.url().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_net {
|
2018-09-05 22:13:36 -04:00
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
|
2018-08-15 20:57:36 -04:00
|
|
|
let url = url.parse::<hyper::Uri>().unwrap();
|
|
|
|
let client = Client::new();
|
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
debug!("Before fetch {}", url);
|
2018-09-12 15:16:42 -04:00
|
|
|
let future = client.get(url).and_then(move |res| {
|
2018-09-05 22:13:36 -04:00
|
|
|
let status = res.status().as_u16() as i32;
|
2018-09-18 14:53:16 -04:00
|
|
|
debug!("fetch {}", status);
|
2018-09-12 15:16:42 -04:00
|
|
|
|
|
|
|
let headers = {
|
|
|
|
let map = res.headers();
|
|
|
|
let keys = map
|
|
|
|
.keys()
|
|
|
|
.map(|s| s.as_str().to_string())
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
let values = map
|
|
|
|
.values()
|
|
|
|
.map(|s| s.to_str().unwrap().to_string())
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
(keys, values)
|
|
|
|
};
|
|
|
|
|
2018-09-05 22:13:36 -04:00
|
|
|
// TODO Handle streaming body.
|
2018-09-12 15:16:42 -04:00
|
|
|
res
|
|
|
|
.into_body()
|
|
|
|
.concat2()
|
|
|
|
.map(move |body| (status, body, headers))
|
2018-09-05 22:13:36 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
let future = future.map_err(|err| -> DenoError { err.into() }).and_then(
|
2018-09-12 15:16:42 -04:00
|
|
|
move |(status, body, headers)| {
|
2018-09-18 14:53:16 -04:00
|
|
|
debug!("fetch body ");
|
2018-09-05 22:13:36 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
// Send the first message without a body. This is just to indicate
|
|
|
|
// what status code.
|
|
|
|
let body_off = builder.create_vector(body.as_ref());
|
2018-09-12 15:16:42 -04:00
|
|
|
let header_keys: Vec<&str> = headers.0.iter().map(|s| &**s).collect();
|
|
|
|
let header_keys_off =
|
|
|
|
builder.create_vector_of_strings(header_keys.as_slice());
|
|
|
|
let header_values: Vec<&str> = headers.1.iter().map(|s| &**s).collect();
|
|
|
|
let header_values_off =
|
|
|
|
builder.create_vector_of_strings(header_values.as_slice());
|
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::FetchRes::create(
|
2018-09-05 22:13:36 -04:00
|
|
|
builder,
|
|
|
|
&msg::FetchResArgs {
|
|
|
|
id,
|
|
|
|
status,
|
|
|
|
body: Some(body_off),
|
2018-09-12 15:16:42 -04:00
|
|
|
header_key: Some(header_keys_off),
|
|
|
|
header_value: Some(header_values_off),
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
2018-09-12 15:16:42 -04:00
|
|
|
|
2018-09-09 19:48:10 -04:00
|
|
|
Ok(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::FetchRes,
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
},
|
2018-08-15 20:57:36 -04:00
|
|
|
);
|
2018-09-05 22:13:36 -04:00
|
|
|
Box::new(future)
|
2018-08-15 20:57:36 -04:00
|
|
|
}
|
|
|
|
|
2018-09-22 04:42:07 -04:00
|
|
|
// This is just type conversion. Implement From trait?
|
|
|
|
// See https://github.com/tokio-rs/tokio/blob/ffd73a64e7ec497622b7f939e38017afe7124dc4/tokio-fs/src/lib.rs#L76-L85
|
|
|
|
fn convert_blocking<F>(f: F) -> Poll<Buf, DenoError>
|
|
|
|
where
|
|
|
|
F: FnOnce() -> DenoResult<Buf>,
|
|
|
|
{
|
|
|
|
use futures::Async::*;
|
|
|
|
match tokio_threadpool::blocking(f) {
|
|
|
|
Ok(Ready(Ok(v))) => Ok(v.into()),
|
|
|
|
Ok(Ready(Err(err))) => Err(err),
|
|
|
|
Ok(NotReady) => Ok(NotReady),
|
|
|
|
Err(_) => panic!("blocking error"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO Do not use macro for the blocking function.. We should instead be able
|
|
|
|
// to do this with a normal function, but there seems to some type system
|
|
|
|
// issues. The type of this function should be something like this:
|
|
|
|
// fn blocking<F>(is_sync: bool, f: F) -> Box<Op>
|
|
|
|
// where F: FnOnce() -> DenoResult<Buf>
|
|
|
|
macro_rules! blocking {
|
|
|
|
($is_sync:expr,$fn:expr) => {
|
|
|
|
if $is_sync {
|
|
|
|
// If synchronous, execute the function immediately on the main thread.
|
|
|
|
Box::new(futures::future::result($fn()))
|
|
|
|
} else {
|
|
|
|
// Otherwise dispatch to thread pool.
|
|
|
|
Box::new(poll_fn(move || convert_blocking($fn)))
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_make_temp_dir(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-09-05 22:13:36 -04:00
|
|
|
let base = Box::new(*base);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_make_temp_dir().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_write {
|
2018-09-12 15:17:17 -04:00
|
|
|
return odd_future(permission_denied());
|
2018-08-23 18:36:45 -04:00
|
|
|
}
|
2018-09-22 04:42:07 -04:00
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let dir = inner.dir().map(PathBuf::from);
|
|
|
|
let prefix = inner.prefix().map(String::from);
|
|
|
|
let suffix = inner.suffix().map(String::from);
|
2018-09-22 04:42:07 -04:00
|
|
|
|
|
|
|
blocking!(base.sync(), || -> OpResult {
|
2018-09-05 22:13:36 -04:00
|
|
|
// TODO(piscisaureus): use byte vector for paths, not a string.
|
2018-09-17 20:41:13 -04:00
|
|
|
// See https://github.com/denoland/isolate/issues/627.
|
2018-09-05 22:13:36 -04:00
|
|
|
// We can't assume that paths are always valid utf8 strings.
|
2018-09-22 04:42:07 -04:00
|
|
|
let path = deno_fs::make_temp_dir(
|
|
|
|
// Converting Option<String> to Option<&str>
|
|
|
|
dir.as_ref().map(|x| &**x),
|
|
|
|
prefix.as_ref().map(|x| &**x),
|
|
|
|
suffix.as_ref().map(|x| &**x),
|
|
|
|
)?;
|
2018-09-05 22:13:36 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
let path_off = builder.create_string(path.to_str().unwrap());
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::MakeTempDirRes::create(
|
2018-09-05 22:13:36 -04:00
|
|
|
builder,
|
|
|
|
&msg::MakeTempDirResArgs {
|
|
|
|
path: Some(path_off),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
2018-09-09 19:48:10 -04:00
|
|
|
Ok(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::MakeTempDirRes,
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-08-23 18:36:45 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_mkdir(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_mkdir().unwrap();
|
|
|
|
let mode = inner.mode();
|
|
|
|
let path = String::from(inner.path().unwrap());
|
2018-09-18 14:53:16 -04:00
|
|
|
|
|
|
|
if !state.flags.allow_write {
|
2018-09-05 22:13:36 -04:00
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
2018-09-22 04:42:07 -04:00
|
|
|
|
|
|
|
blocking!(base.sync(), || {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_mkdir {}", path);
|
2018-09-22 04:42:07 -04:00
|
|
|
deno_fs::mkdir(Path::new(&path), mode)?;
|
2018-09-18 14:53:16 -04:00
|
|
|
Ok(empty_buf())
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-08-26 02:26:30 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_open(
|
2018-09-27 00:56:39 -04:00
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_open().unwrap();
|
|
|
|
let filename = PathBuf::from(inner.filename().unwrap());
|
|
|
|
// TODO let perm = inner.perm();
|
2018-09-27 00:56:39 -04:00
|
|
|
|
|
|
|
let op = tokio::fs::File::open(filename)
|
|
|
|
.map_err(|err| DenoError::from(err))
|
|
|
|
.and_then(move |fs_file| -> OpResult {
|
2018-10-01 19:37:18 -04:00
|
|
|
let resource = resources::add_fs_file(fs_file);
|
2018-09-27 00:56:39 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::OpenRes::create(
|
2018-09-27 00:56:39 -04:00
|
|
|
builder,
|
|
|
|
&msg::OpenResArgs {
|
2018-10-01 19:37:18 -04:00
|
|
|
rid: resource.rid,
|
2018-09-27 00:56:39 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::OpenRes,
|
2018-09-27 00:56:39 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
});
|
|
|
|
Box::new(op)
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_close(
|
2018-10-03 23:58:29 -04:00
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:41:59 -04:00
|
|
|
let inner = base.inner_as_close().unwrap();
|
|
|
|
let rid = inner.rid();
|
2018-10-03 23:58:29 -04:00
|
|
|
match resources::lookup(rid) {
|
|
|
|
None => odd_future(errors::new(
|
|
|
|
errors::ErrorKind::BadFileDescriptor,
|
|
|
|
String::from("Bad File Descriptor"),
|
|
|
|
)),
|
|
|
|
Some(mut resource) => {
|
|
|
|
resource.close();
|
|
|
|
ok_future(empty_buf())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-05 12:16:24 -04:00
|
|
|
fn op_shutdown(
|
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
|
|
|
let inner = base.inner_as_shutdown().unwrap();
|
|
|
|
let rid = inner.rid();
|
|
|
|
let how = inner.how();
|
|
|
|
match resources::lookup(rid) {
|
|
|
|
None => odd_future(errors::new(
|
|
|
|
errors::ErrorKind::BadFileDescriptor,
|
|
|
|
String::from("Bad File Descriptor"),
|
|
|
|
)),
|
|
|
|
Some(mut resource) => {
|
|
|
|
let shutdown_mode = match how {
|
|
|
|
0 => Shutdown::Read,
|
|
|
|
1 => Shutdown::Write,
|
|
|
|
_ => unimplemented!(),
|
|
|
|
};
|
|
|
|
blocking!(base.sync(), || {
|
|
|
|
// Use UFCS for disambiguation
|
|
|
|
Resource::shutdown(&mut resource, shutdown_mode)?;
|
|
|
|
Ok(empty_buf())
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_read(
|
2018-09-27 00:56:39 -04:00
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_read().unwrap();
|
|
|
|
let rid = inner.rid();
|
2018-09-27 00:56:39 -04:00
|
|
|
|
2018-10-01 19:37:18 -04:00
|
|
|
match resources::lookup(rid) {
|
2018-09-27 00:56:39 -04:00
|
|
|
None => odd_future(errors::new(
|
|
|
|
errors::ErrorKind::BadFileDescriptor,
|
|
|
|
String::from("Bad File Descriptor"),
|
|
|
|
)),
|
2018-10-01 19:43:27 -04:00
|
|
|
Some(resource) => {
|
|
|
|
let op = tokio_io::io::read(resource, data)
|
|
|
|
.map_err(|err| DenoError::from(err))
|
|
|
|
.and_then(move |(_resource, _buf, nread)| {
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::ReadRes::create(
|
2018-10-01 19:43:27 -04:00
|
|
|
builder,
|
|
|
|
&msg::ReadResArgs {
|
|
|
|
nread: nread as u32,
|
|
|
|
eof: nread == 0,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::ReadRes,
|
2018-10-01 19:43:27 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
});
|
2018-09-27 00:56:39 -04:00
|
|
|
Box::new(op)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_write(
|
2018-09-27 00:56:39 -04:00
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_write().unwrap();
|
|
|
|
let rid = inner.rid();
|
2018-09-27 00:56:39 -04:00
|
|
|
|
2018-10-01 19:37:18 -04:00
|
|
|
match resources::lookup(rid) {
|
2018-09-27 00:56:39 -04:00
|
|
|
None => odd_future(errors::new(
|
|
|
|
errors::ErrorKind::BadFileDescriptor,
|
|
|
|
String::from("Bad File Descriptor"),
|
|
|
|
)),
|
2018-10-01 19:43:27 -04:00
|
|
|
Some(resource) => {
|
|
|
|
let len = data.len();
|
|
|
|
let op = tokio_io::io::write_all(resource, data)
|
|
|
|
.map_err(|err| DenoError::from(err))
|
|
|
|
.and_then(move |(_resource, _buf)| {
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::WriteRes::create(
|
2018-10-01 19:43:27 -04:00
|
|
|
builder,
|
|
|
|
&msg::WriteResArgs {
|
|
|
|
nbyte: len as u32,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::WriteRes,
|
2018-10-01 19:43:27 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
});
|
2018-09-27 00:56:39 -04:00
|
|
|
Box::new(op)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_remove(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_remove().unwrap();
|
|
|
|
let path = PathBuf::from(inner.path().unwrap());
|
|
|
|
let recursive = inner.recursive();
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_write {
|
2018-09-10 23:40:03 -04:00
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
2018-09-22 04:42:07 -04:00
|
|
|
blocking!(base.sync(), || {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_remove {}", path.display());
|
2018-09-22 04:42:07 -04:00
|
|
|
let metadata = fs::metadata(&path)?;
|
2018-09-10 23:40:03 -04:00
|
|
|
if metadata.is_file() {
|
2018-09-22 04:42:07 -04:00
|
|
|
fs::remove_file(&path)?;
|
2018-09-10 23:40:03 -04:00
|
|
|
} else {
|
|
|
|
if recursive {
|
2018-09-22 04:42:07 -04:00
|
|
|
remove_dir_all(&path)?;
|
2018-09-10 23:40:03 -04:00
|
|
|
} else {
|
2018-09-22 04:42:07 -04:00
|
|
|
fs::remove_dir(&path)?;
|
2018-09-10 23:40:03 -04:00
|
|
|
}
|
|
|
|
}
|
2018-09-18 14:53:16 -04:00
|
|
|
Ok(empty_buf())
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-09-10 23:40:03 -04:00
|
|
|
}
|
|
|
|
|
2018-09-17 20:41:13 -04:00
|
|
|
// Prototype https://github.com/denoland/isolate/blob/golang/os.go#L171-L184
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_read_file(
|
2018-09-27 17:33:10 -04:00
|
|
|
_config: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_read_file().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let filename = PathBuf::from(inner.filename().unwrap());
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_read_file {}", filename.display());
|
2018-09-22 04:42:07 -04:00
|
|
|
blocking!(base.sync(), || {
|
|
|
|
let vec = fs::read(&filename)?;
|
2018-10-03 21:12:23 -04:00
|
|
|
// Build the response message. memcpy data into inner.
|
2018-09-05 22:13:36 -04:00
|
|
|
// TODO(ry) zero-copy.
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
let data_off = builder.create_vector(vec.as_slice());
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::ReadFileRes::create(
|
2018-09-05 22:13:36 -04:00
|
|
|
builder,
|
2018-09-09 20:25:43 -04:00
|
|
|
&msg::ReadFileResArgs {
|
2018-09-05 22:13:36 -04:00
|
|
|
data: Some(data_off),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
2018-09-09 19:48:10 -04:00
|
|
|
Ok(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::ReadFileRes,
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-08-09 13:24:30 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_copy_file(
|
2018-09-30 18:06:41 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_copy_file().unwrap();
|
|
|
|
let from = PathBuf::from(inner.from().unwrap());
|
|
|
|
let to = PathBuf::from(inner.to().unwrap());
|
2018-09-30 18:06:41 -04:00
|
|
|
|
|
|
|
if !state.flags.allow_write {
|
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_copy_file {} {}", from.display(), to.display());
|
2018-09-30 18:06:41 -04:00
|
|
|
blocking!(base.sync(), || {
|
|
|
|
fs::copy(&from, &to)?;
|
|
|
|
Ok(empty_buf())
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2018-08-29 09:22:25 -04:00
|
|
|
macro_rules! to_seconds {
|
|
|
|
($time:expr) => {{
|
|
|
|
// Unwrap is safe here as if the file is before the unix epoch
|
|
|
|
// something is very wrong.
|
2018-08-30 13:54:56 -04:00
|
|
|
$time
|
|
|
|
.and_then(|t| Ok(t.duration_since(UNIX_EPOCH).unwrap().as_secs()))
|
|
|
|
.unwrap_or(0)
|
|
|
|
}};
|
2018-08-29 09:22:25 -04:00
|
|
|
}
|
|
|
|
|
2018-09-12 10:28:48 -04:00
|
|
|
#[cfg(any(unix))]
|
2018-09-17 19:53:55 -04:00
|
|
|
fn get_mode(perm: fs::Permissions) -> u32 {
|
|
|
|
perm.mode()
|
2018-09-12 10:28:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(not(any(unix)))]
|
2018-09-17 19:53:55 -04:00
|
|
|
fn get_mode(_perm: fs::Permissions) -> u32 {
|
|
|
|
0
|
2018-09-12 10:28:48 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_stat(
|
2018-09-27 17:33:10 -04:00
|
|
|
_config: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_stat().unwrap();
|
2018-09-05 22:13:36 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let filename = PathBuf::from(inner.filename().unwrap());
|
|
|
|
let lstat = inner.lstat();
|
2018-09-02 02:33:24 -04:00
|
|
|
|
2018-09-22 04:42:07 -04:00
|
|
|
blocking!(base.sync(), || {
|
2018-09-05 22:13:36 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_stat {} {}", filename.display(), lstat);
|
2018-09-05 22:13:36 -04:00
|
|
|
let metadata = if lstat {
|
2018-09-22 04:42:07 -04:00
|
|
|
fs::symlink_metadata(&filename)?
|
2018-09-05 22:13:36 -04:00
|
|
|
} else {
|
2018-09-22 04:42:07 -04:00
|
|
|
fs::metadata(&filename)?
|
2018-09-05 22:13:36 -04:00
|
|
|
};
|
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::StatRes::create(
|
2018-09-05 22:13:36 -04:00
|
|
|
builder,
|
2018-09-11 15:38:53 -04:00
|
|
|
&msg::StatResArgs {
|
2018-09-05 22:13:36 -04:00
|
|
|
is_file: metadata.is_file(),
|
|
|
|
is_symlink: metadata.file_type().is_symlink(),
|
|
|
|
len: metadata.len(),
|
|
|
|
modified: to_seconds!(metadata.modified()),
|
|
|
|
accessed: to_seconds!(metadata.accessed()),
|
|
|
|
created: to_seconds!(metadata.created()),
|
2018-09-12 10:28:48 -04:00
|
|
|
mode: get_mode(metadata.permissions()),
|
2018-09-17 19:53:55 -04:00
|
|
|
has_mode: cfg!(target_family = "unix"),
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
2018-08-29 09:22:25 -04:00
|
|
|
|
2018-09-09 19:48:10 -04:00
|
|
|
Ok(serialize_response(
|
2018-09-05 22:13:36 -04:00
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::StatRes,
|
2018-09-05 22:13:36 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-08-29 09:22:25 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_read_dir(
|
2018-10-03 17:56:56 -04:00
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_read_dir().unwrap();
|
2018-10-03 17:56:56 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let path = String::from(inner.path().unwrap());
|
2018-10-03 17:56:56 -04:00
|
|
|
|
|
|
|
blocking!(base.sync(), || -> OpResult {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_read_dir {}", path);
|
2018-10-03 17:56:56 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
let entries: Vec<_> = fs::read_dir(Path::new(&path))?
|
|
|
|
.map(|entry| {
|
|
|
|
let entry = entry.unwrap();
|
|
|
|
let metadata = entry.metadata().unwrap();
|
|
|
|
let file_type = metadata.file_type();
|
|
|
|
let name = builder.create_string(entry.file_name().to_str().unwrap());
|
|
|
|
let path = builder.create_string(entry.path().to_str().unwrap());
|
|
|
|
|
|
|
|
msg::StatRes::create(
|
|
|
|
builder,
|
|
|
|
&msg::StatResArgs {
|
|
|
|
is_file: file_type.is_file(),
|
|
|
|
is_symlink: file_type.is_symlink(),
|
|
|
|
len: metadata.len(),
|
|
|
|
modified: to_seconds!(metadata.modified()),
|
|
|
|
accessed: to_seconds!(metadata.accessed()),
|
|
|
|
created: to_seconds!(metadata.created()),
|
|
|
|
name: Some(name),
|
|
|
|
path: Some(path),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}).collect();
|
|
|
|
|
|
|
|
let entries = builder.create_vector(&entries);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::ReadDirRes::create(
|
2018-10-03 17:56:56 -04:00
|
|
|
builder,
|
|
|
|
&msg::ReadDirResArgs {
|
|
|
|
entries: Some(entries),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::ReadDirRes,
|
2018-10-03 17:56:56 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_write_file(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_write_file().unwrap();
|
2018-09-02 02:33:24 -04:00
|
|
|
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_write {
|
2018-09-12 15:17:17 -04:00
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
2018-09-18 14:53:16 -04:00
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let filename = String::from(inner.filename().unwrap());
|
|
|
|
let perm = inner.perm();
|
2018-09-22 04:42:07 -04:00
|
|
|
|
|
|
|
blocking!(base.sync(), || -> OpResult {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_write_file {} {}", filename, data.len());
|
2018-09-27 17:33:10 -04:00
|
|
|
deno_fs::write_file(Path::new(&filename), data, perm)?;
|
2018-09-18 14:53:16 -04:00
|
|
|
Ok(empty_buf())
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-08-22 13:19:32 -04:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_rename(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_write {
|
2018-09-12 11:44:58 -04:00
|
|
|
return odd_future(permission_denied());
|
2018-09-19 00:38:24 -04:00
|
|
|
}
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_rename().unwrap();
|
|
|
|
let oldpath = PathBuf::from(inner.oldpath().unwrap());
|
|
|
|
let newpath = PathBuf::from(inner.newpath().unwrap());
|
2018-09-22 04:42:07 -04:00
|
|
|
blocking!(base.sync(), || -> OpResult {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_rename {} {}", oldpath.display(), newpath.display());
|
2018-09-22 04:42:07 -04:00
|
|
|
fs::rename(&oldpath, &newpath)?;
|
2018-09-18 14:53:16 -04:00
|
|
|
Ok(empty_buf())
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-09-03 20:22:30 -04:00
|
|
|
}
|
2018-09-19 00:38:24 -04:00
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_symlink(
|
2018-09-27 17:33:10 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-09-18 14:53:16 -04:00
|
|
|
if !state.flags.allow_write {
|
2018-09-19 00:38:24 -04:00
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
// TODO Use type for Windows.
|
|
|
|
if cfg!(windows) {
|
|
|
|
return odd_future(not_implemented());
|
|
|
|
}
|
2018-09-22 04:42:07 -04:00
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_symlink().unwrap();
|
|
|
|
let oldname = PathBuf::from(inner.oldname().unwrap());
|
|
|
|
let newname = PathBuf::from(inner.newname().unwrap());
|
2018-09-22 04:42:07 -04:00
|
|
|
blocking!(base.sync(), || -> OpResult {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_symlink {} {}", oldname.display(), newname.display());
|
2018-09-22 04:42:07 -04:00
|
|
|
#[cfg(any(unix))]
|
|
|
|
std::os::unix::fs::symlink(&oldname, &newname)?;
|
|
|
|
Ok(empty_buf())
|
|
|
|
})
|
2018-09-19 00:38:24 -04:00
|
|
|
}
|
2018-09-25 00:20:49 -04:00
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_read_link(
|
2018-09-27 17:33:10 -04:00
|
|
|
_state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_readlink().unwrap();
|
2018-09-25 00:20:49 -04:00
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:12:23 -04:00
|
|
|
let name = PathBuf::from(inner.name().unwrap());
|
2018-09-22 04:42:07 -04:00
|
|
|
|
|
|
|
blocking!(base.sync(), || -> OpResult {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_read_link {}", name.display());
|
2018-09-22 04:42:07 -04:00
|
|
|
let path = fs::read_link(&name)?;
|
2018-09-25 00:20:49 -04:00
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
|
|
|
let path_off = builder.create_string(path.to_str().unwrap());
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = msg::ReadlinkRes::create(
|
2018-09-25 00:20:49 -04:00
|
|
|
builder,
|
|
|
|
&msg::ReadlinkResArgs {
|
|
|
|
path: Some(path_off),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:12:23 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::ReadlinkRes,
|
2018-09-25 00:20:49 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
2018-09-22 04:42:07 -04:00
|
|
|
})
|
2018-09-25 00:20:49 -04:00
|
|
|
}
|
2018-09-30 15:06:20 -04:00
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_truncate(
|
2018-09-30 15:06:20 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
|
|
|
|
|
|
|
if !state.flags.allow_write {
|
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
|
2018-10-03 21:12:23 -04:00
|
|
|
let inner = base.inner_as_truncate().unwrap();
|
|
|
|
let filename = String::from(inner.name().unwrap());
|
|
|
|
let len = inner.len();
|
2018-09-30 15:06:20 -04:00
|
|
|
blocking!(base.sync(), || {
|
2018-10-03 20:48:02 -04:00
|
|
|
debug!("op_truncate {} {}", filename, len);
|
2018-09-30 15:06:20 -04:00
|
|
|
let f = fs::OpenOptions::new().write(true).open(&filename)?;
|
|
|
|
f.set_len(len as u64)?;
|
|
|
|
Ok(empty_buf())
|
|
|
|
})
|
|
|
|
}
|
2018-10-03 23:58:29 -04:00
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_listen(
|
2018-10-03 23:58:29 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
|
|
|
if !state.flags.allow_net {
|
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
|
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:41:59 -04:00
|
|
|
let inner = base.inner_as_listen().unwrap();
|
|
|
|
let network = inner.network().unwrap();
|
2018-10-03 23:58:29 -04:00
|
|
|
assert_eq!(network, "tcp");
|
2018-10-03 21:41:59 -04:00
|
|
|
let address = inner.address().unwrap();
|
2018-10-03 23:58:29 -04:00
|
|
|
|
|
|
|
Box::new(futures::future::result((move || {
|
|
|
|
// TODO properly parse addr
|
|
|
|
let addr = SocketAddr::from_str(address).unwrap();
|
|
|
|
|
|
|
|
let listener = TcpListener::bind(&addr)?;
|
|
|
|
let resource = resources::add_tcp_listener(listener);
|
|
|
|
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-10-03 21:41:59 -04:00
|
|
|
let inner = msg::ListenRes::create(
|
2018-10-03 23:58:29 -04:00
|
|
|
builder,
|
|
|
|
&msg::ListenResArgs {
|
|
|
|
rid: resource.rid,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:41:59 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::ListenRes,
|
2018-10-03 23:58:29 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
})()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn new_conn(cmd_id: u32, tcp_stream: TcpStream) -> OpResult {
|
|
|
|
let tcp_stream_resource = resources::add_tcp_stream(tcp_stream);
|
|
|
|
// TODO forward socket_addr to client.
|
|
|
|
|
|
|
|
let builder = &mut FlatBufferBuilder::new();
|
2018-10-03 21:41:59 -04:00
|
|
|
let inner = msg::NewConn::create(
|
2018-10-03 23:58:29 -04:00
|
|
|
builder,
|
|
|
|
&msg::NewConnArgs {
|
|
|
|
rid: tcp_stream_resource.rid,
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
);
|
|
|
|
Ok(serialize_response(
|
|
|
|
cmd_id,
|
|
|
|
builder,
|
|
|
|
msg::BaseArgs {
|
2018-10-03 21:41:59 -04:00
|
|
|
inner: Some(inner.as_union_value()),
|
|
|
|
inner_type: msg::Any::NewConn,
|
2018-10-03 23:58:29 -04:00
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
))
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_accept(
|
2018-10-03 23:58:29 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
|
|
|
if !state.flags.allow_net {
|
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
|
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:41:59 -04:00
|
|
|
let inner = base.inner_as_accept().unwrap();
|
|
|
|
let server_rid = inner.rid();
|
2018-10-03 23:58:29 -04:00
|
|
|
|
|
|
|
match resources::lookup(server_rid) {
|
|
|
|
None => odd_future(errors::new(
|
|
|
|
errors::ErrorKind::BadFileDescriptor,
|
|
|
|
String::from("Bad File Descriptor"),
|
|
|
|
)),
|
|
|
|
Some(server_resource) => {
|
|
|
|
let op = tokio_util::accept(server_resource)
|
|
|
|
.map_err(|err| DenoError::from(err))
|
|
|
|
.and_then(move |(tcp_stream, _socket_addr)| {
|
|
|
|
new_conn(cmd_id, tcp_stream)
|
|
|
|
});
|
|
|
|
Box::new(op)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-03 20:48:02 -04:00
|
|
|
fn op_dial(
|
2018-10-03 23:58:29 -04:00
|
|
|
state: Arc<IsolateState>,
|
|
|
|
base: &msg::Base,
|
|
|
|
data: &'static mut [u8],
|
|
|
|
) -> Box<Op> {
|
|
|
|
assert_eq!(data.len(), 0);
|
|
|
|
if !state.flags.allow_net {
|
|
|
|
return odd_future(permission_denied());
|
|
|
|
}
|
|
|
|
|
|
|
|
let cmd_id = base.cmd_id();
|
2018-10-03 21:41:59 -04:00
|
|
|
let inner = base.inner_as_dial().unwrap();
|
|
|
|
let network = inner.network().unwrap();
|
2018-10-03 23:58:29 -04:00
|
|
|
assert_eq!(network, "tcp");
|
2018-10-03 21:41:59 -04:00
|
|
|
let address = inner.address().unwrap();
|
2018-10-03 23:58:29 -04:00
|
|
|
|
|
|
|
// TODO properly parse addr
|
|
|
|
let addr = SocketAddr::from_str(address).unwrap();
|
|
|
|
|
|
|
|
let op = TcpStream::connect(&addr)
|
|
|
|
.map_err(|err| err.into())
|
|
|
|
.and_then(move |tcp_stream| new_conn(cmd_id, tcp_stream));
|
|
|
|
Box::new(op)
|
|
|
|
}
|