2020-01-07 06:45:44 -05:00
|
|
|
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
// This module provides higher level implementation of Isolate that
|
|
|
|
// supports asynchronous loading and executution of ES Modules.
|
|
|
|
// The isolate.rs should never depend on this module.
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
use rusty_v8 as v8;
|
|
|
|
|
|
|
|
use crate::any_error::ErrBox;
|
|
|
|
use crate::bindings;
|
2020-01-25 08:31:42 -05:00
|
|
|
use crate::ErrWithV8Handle;
|
2020-01-07 06:45:44 -05:00
|
|
|
use futures::future::Future;
|
|
|
|
use futures::future::FutureExt;
|
|
|
|
use futures::ready;
|
|
|
|
use futures::stream::FuturesUnordered;
|
|
|
|
use futures::stream::StreamExt;
|
|
|
|
use futures::stream::StreamFuture;
|
|
|
|
use futures::task::AtomicWaker;
|
|
|
|
use libc::c_void;
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use std::ops::{Deref, DerefMut};
|
|
|
|
use std::option::Option;
|
|
|
|
use std::pin::Pin;
|
|
|
|
use std::sync::Arc;
|
|
|
|
use std::task::Context;
|
|
|
|
use std::task::Poll;
|
|
|
|
|
|
|
|
use crate::isolate::Isolate;
|
|
|
|
use crate::isolate::StartupData;
|
2020-01-08 09:06:04 -05:00
|
|
|
use crate::module_specifier::ModuleSpecifier;
|
|
|
|
use crate::modules::LoadState;
|
|
|
|
use crate::modules::Loader;
|
|
|
|
use crate::modules::Modules;
|
|
|
|
use crate::modules::RecursiveModuleLoad;
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
pub type ModuleId = i32;
|
|
|
|
pub type DynImportId = i32;
|
|
|
|
/// Represent result of fetching the source code of a module. Found module URL
|
|
|
|
/// might be different from specified URL used for loading due to redirections
|
|
|
|
/// (like HTTP 303). E.G. Both https://example.com/a.ts and
|
|
|
|
/// https://example.com/b.ts may point to https://example.com/c.ts
|
|
|
|
/// By keeping track of specified and found URL we can alias modules and avoid
|
|
|
|
/// recompiling the same code 3 times.
|
|
|
|
#[derive(Debug, Eq, PartialEq)]
|
|
|
|
pub struct SourceCodeInfo {
|
|
|
|
pub code: String,
|
|
|
|
pub module_url_specified: String,
|
|
|
|
pub module_url_found: String,
|
|
|
|
}
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
/// More specialized version of `Isolate` that provides loading
|
|
|
|
/// and execution of ES Modules.
|
2020-01-07 06:45:44 -05:00
|
|
|
///
|
2020-01-11 04:49:16 -05:00
|
|
|
/// Creating `EsIsolate` requires to pass `loader` argument
|
|
|
|
/// that implements `Loader` trait - that way actual resolution and
|
|
|
|
/// loading of modules can be customized by the implementor.
|
2020-01-07 06:45:44 -05:00
|
|
|
pub struct EsIsolate {
|
|
|
|
core_isolate: Box<Isolate>,
|
2020-01-08 09:06:04 -05:00
|
|
|
loader: Arc<Box<dyn Loader + Unpin>>,
|
|
|
|
pub modules: Modules,
|
2020-01-07 06:45:44 -05:00
|
|
|
pub(crate) next_dyn_import_id: DynImportId,
|
|
|
|
pub(crate) dyn_import_map:
|
|
|
|
HashMap<DynImportId, v8::Global<v8::PromiseResolver>>,
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
pending_dyn_imports: FuturesUnordered<StreamFuture<RecursiveModuleLoad>>,
|
2020-01-07 06:45:44 -05:00
|
|
|
waker: AtomicWaker,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Deref for EsIsolate {
|
|
|
|
type Target = Isolate;
|
|
|
|
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
&self.core_isolate
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl DerefMut for EsIsolate {
|
|
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
|
|
&mut self.core_isolate
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
unsafe impl Send for EsIsolate {}
|
|
|
|
|
|
|
|
impl Drop for EsIsolate {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
let isolate = self.core_isolate.v8_isolate.as_ref().unwrap();
|
|
|
|
// Clear persistent handles we own.
|
|
|
|
{
|
|
|
|
let mut locker = v8::Locker::new(&isolate);
|
2020-01-25 08:31:42 -05:00
|
|
|
let scope = locker.enter();
|
2020-01-08 09:06:04 -05:00
|
|
|
for module in self.modules.info.values_mut() {
|
2020-01-07 06:45:44 -05:00
|
|
|
module.handle.reset(scope);
|
|
|
|
}
|
|
|
|
for handle in self.dyn_import_map.values_mut() {
|
|
|
|
handle.reset(scope);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl EsIsolate {
|
2020-01-08 09:06:04 -05:00
|
|
|
pub fn new(
|
|
|
|
loader: Box<dyn Loader + Unpin>,
|
|
|
|
startup_data: StartupData,
|
|
|
|
will_snapshot: bool,
|
|
|
|
) -> Box<Self> {
|
2020-01-07 06:45:44 -05:00
|
|
|
let mut core_isolate = Isolate::new(startup_data, will_snapshot);
|
|
|
|
{
|
|
|
|
let isolate = core_isolate.v8_isolate.as_mut().unwrap();
|
|
|
|
isolate.set_host_initialize_import_meta_object_callback(
|
|
|
|
bindings::host_initialize_import_meta_object_callback,
|
|
|
|
);
|
|
|
|
isolate.set_host_import_module_dynamically_callback(
|
|
|
|
bindings::host_import_module_dynamically_callback,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
let es_isolate = Self {
|
2020-01-08 09:06:04 -05:00
|
|
|
modules: Modules::new(),
|
|
|
|
loader: Arc::new(loader),
|
2020-01-07 06:45:44 -05:00
|
|
|
core_isolate,
|
|
|
|
next_dyn_import_id: 0,
|
|
|
|
dyn_import_map: HashMap::new(),
|
|
|
|
pending_dyn_imports: FuturesUnordered::new(),
|
|
|
|
waker: AtomicWaker::new(),
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut boxed_es_isolate = Box::new(es_isolate);
|
|
|
|
{
|
|
|
|
let es_isolate_ptr: *mut Self = Box::into_raw(boxed_es_isolate);
|
|
|
|
boxed_es_isolate = unsafe { Box::from_raw(es_isolate_ptr) };
|
|
|
|
unsafe {
|
|
|
|
let v8_isolate = boxed_es_isolate.v8_isolate.as_mut().unwrap();
|
|
|
|
v8_isolate.set_data(1, es_isolate_ptr as *mut c_void);
|
|
|
|
};
|
|
|
|
}
|
|
|
|
boxed_es_isolate
|
|
|
|
}
|
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
/// Low-level module creation.
|
|
|
|
///
|
|
|
|
/// Called during module loading or dynamic import loading.
|
|
|
|
fn mod_new(
|
|
|
|
&mut self,
|
|
|
|
main: bool,
|
|
|
|
name: &str,
|
|
|
|
source: &str,
|
|
|
|
) -> Result<ModuleId, ErrBox> {
|
2020-01-07 06:45:44 -05:00
|
|
|
let isolate = self.core_isolate.v8_isolate.as_ref().unwrap();
|
|
|
|
let mut locker = v8::Locker::new(&isolate);
|
|
|
|
|
2020-01-21 14:24:31 -05:00
|
|
|
let mut hs = v8::HandleScope::new(locker.enter());
|
2020-01-07 06:45:44 -05:00
|
|
|
let scope = hs.enter();
|
|
|
|
assert!(!self.core_isolate.global_context.is_empty());
|
2020-01-21 14:24:31 -05:00
|
|
|
let context = self.core_isolate.global_context.get(scope).unwrap();
|
|
|
|
let mut cs = v8::ContextScope::new(scope, context);
|
|
|
|
let scope = cs.enter();
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
let name_str = v8::String::new(scope, name).unwrap();
|
|
|
|
let source_str = v8::String::new(scope, source).unwrap();
|
|
|
|
|
|
|
|
let origin = bindings::module_origin(scope, name_str);
|
|
|
|
let source = v8::script_compiler::Source::new(source_str, &origin);
|
|
|
|
|
|
|
|
let mut try_catch = v8::TryCatch::new(scope);
|
|
|
|
let tc = try_catch.enter();
|
|
|
|
|
|
|
|
let maybe_module = v8::script_compiler::compile_module(&isolate, source);
|
|
|
|
|
|
|
|
if tc.has_caught() {
|
|
|
|
assert!(maybe_module.is_none());
|
2020-01-25 08:31:42 -05:00
|
|
|
return self
|
|
|
|
.core_isolate
|
|
|
|
.exception_to_err_result(scope, tc.exception().unwrap());
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
2020-01-25 08:31:42 -05:00
|
|
|
|
2020-01-07 06:45:44 -05:00
|
|
|
let module = maybe_module.unwrap();
|
|
|
|
let id = module.get_identity_hash();
|
|
|
|
|
2020-01-25 12:53:16 -05:00
|
|
|
let mut import_specifiers: Vec<ModuleSpecifier> = vec![];
|
2020-01-07 06:45:44 -05:00
|
|
|
for i in 0..module.get_module_requests_length() {
|
2020-01-25 12:53:16 -05:00
|
|
|
let import_specifier =
|
|
|
|
module.get_module_request(i).to_rust_string_lossy(scope);
|
|
|
|
let module_specifier =
|
|
|
|
self.loader.resolve(&import_specifier, name, false)?;
|
|
|
|
import_specifiers.push(module_specifier);
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
let mut handle = v8::Global::<v8::Module>::new();
|
|
|
|
handle.set(scope, module);
|
2020-01-08 09:06:04 -05:00
|
|
|
self
|
|
|
|
.modules
|
|
|
|
.register(id, name, main, handle, import_specifiers);
|
2020-01-25 08:31:42 -05:00
|
|
|
Ok(id)
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
/// Instantiates a ES module
|
2020-01-11 04:49:16 -05:00
|
|
|
///
|
2020-01-25 08:31:42 -05:00
|
|
|
/// ErrBox can be downcast to a type that exposes additional information about
|
|
|
|
/// the V8 exception. By default this type is CoreJSError, however it may be a
|
|
|
|
/// different type if Isolate::set_js_error_create() has been used.
|
|
|
|
fn mod_instantiate(&mut self, id: ModuleId) -> Result<(), ErrBox> {
|
2020-01-07 06:45:44 -05:00
|
|
|
let isolate = self.core_isolate.v8_isolate.as_ref().unwrap();
|
|
|
|
let mut locker = v8::Locker::new(isolate);
|
2020-01-21 14:24:31 -05:00
|
|
|
let mut hs = v8::HandleScope::new(locker.enter());
|
2020-01-07 06:45:44 -05:00
|
|
|
let scope = hs.enter();
|
|
|
|
assert!(!self.core_isolate.global_context.is_empty());
|
2020-01-21 14:24:31 -05:00
|
|
|
let context = self.core_isolate.global_context.get(scope).unwrap();
|
|
|
|
let mut cs = v8::ContextScope::new(scope, context);
|
2020-01-25 08:31:42 -05:00
|
|
|
let scope = cs.enter();
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
let mut try_catch = v8::TryCatch::new(scope);
|
|
|
|
let tc = try_catch.enter();
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
let module_info = match self.modules.get_info(id) {
|
|
|
|
Some(info) => info,
|
|
|
|
None if id == 0 => return Ok(()),
|
|
|
|
_ => panic!("module id {} not found in module table", id),
|
|
|
|
};
|
|
|
|
let mut module = module_info.handle.get(scope).unwrap();
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
if module.get_status() == v8::ModuleStatus::Errored {
|
2020-01-25 08:31:42 -05:00
|
|
|
self.exception_to_err_result(scope, module.get_exception())?
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
let result =
|
2020-01-07 06:45:44 -05:00
|
|
|
module.instantiate_module(context, bindings::module_resolve_callback);
|
2020-01-25 08:31:42 -05:00
|
|
|
match result {
|
|
|
|
Some(_) => Ok(()),
|
|
|
|
None => {
|
|
|
|
let exception = tc.exception().unwrap();
|
|
|
|
self.exception_to_err_result(scope, exception)
|
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
/// Evaluates an already instantiated ES module.
|
2020-01-07 06:45:44 -05:00
|
|
|
///
|
|
|
|
/// ErrBox can be downcast to a type that exposes additional information about
|
|
|
|
/// the V8 exception. By default this type is CoreJSError, however it may be a
|
|
|
|
/// different type if Isolate::set_js_error_create() has been used.
|
2020-01-25 08:31:42 -05:00
|
|
|
pub fn mod_evaluate(&mut self, id: ModuleId) -> Result<(), ErrBox> {
|
2020-01-07 06:45:44 -05:00
|
|
|
let isolate = self.core_isolate.v8_isolate.as_ref().unwrap();
|
|
|
|
let mut locker = v8::Locker::new(isolate);
|
2020-01-21 14:24:31 -05:00
|
|
|
let mut hs = v8::HandleScope::new(locker.enter());
|
2020-01-07 06:45:44 -05:00
|
|
|
let scope = hs.enter();
|
|
|
|
assert!(!self.core_isolate.global_context.is_empty());
|
2020-01-21 14:24:31 -05:00
|
|
|
let context = self.core_isolate.global_context.get(scope).unwrap();
|
|
|
|
let mut cs = v8::ContextScope::new(scope, context);
|
|
|
|
let scope = cs.enter();
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
let info = self.modules.get_info(id).expect("ModuleInfo not found");
|
2020-01-07 06:45:44 -05:00
|
|
|
let mut module = info.handle.get(scope).expect("Empty module handle");
|
|
|
|
let mut status = module.get_status();
|
|
|
|
|
|
|
|
if status == v8::ModuleStatus::Instantiated {
|
|
|
|
let ok = module.evaluate(scope, context).is_some();
|
|
|
|
// Update status after evaluating.
|
|
|
|
status = module.get_status();
|
|
|
|
if ok {
|
|
|
|
assert!(
|
|
|
|
status == v8::ModuleStatus::Evaluated
|
|
|
|
|| status == v8::ModuleStatus::Errored
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
assert!(status == v8::ModuleStatus::Errored);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
match status {
|
2020-01-25 08:31:42 -05:00
|
|
|
v8::ModuleStatus::Evaluated => Ok(()),
|
2020-01-07 06:45:44 -05:00
|
|
|
v8::ModuleStatus::Errored => {
|
2020-01-25 08:31:42 -05:00
|
|
|
let i = &mut self.core_isolate;
|
|
|
|
let exception = module.get_exception();
|
|
|
|
i.exception_to_err_result(scope, exception)
|
|
|
|
.map_err(|err| i.attach_handle_to_error(scope, err, exception))
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
other => panic!("Unexpected module status {:?}", other),
|
2020-01-25 08:31:42 -05:00
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
// Called by V8 during `Isolate::mod_instantiate`.
|
2020-01-08 09:06:04 -05:00
|
|
|
pub fn module_resolve_cb(
|
|
|
|
&mut self,
|
|
|
|
specifier: &str,
|
|
|
|
referrer_id: ModuleId,
|
|
|
|
) -> ModuleId {
|
|
|
|
let referrer = self.modules.get_name(referrer_id).unwrap();
|
|
|
|
let specifier = self
|
2020-01-25 12:53:16 -05:00
|
|
|
.loader
|
|
|
|
.resolve(specifier, referrer, false)
|
|
|
|
.expect("Module should have been already resolved");
|
2020-01-08 09:06:04 -05:00
|
|
|
self.modules.get_id(specifier.as_str()).unwrap_or(0)
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
// Called by V8 during `Isolate::mod_instantiate`.
|
2020-01-07 06:45:44 -05:00
|
|
|
pub fn dyn_import_cb(
|
|
|
|
&mut self,
|
|
|
|
specifier: &str,
|
|
|
|
referrer: &str,
|
|
|
|
id: DynImportId,
|
|
|
|
) {
|
|
|
|
debug!("dyn_import specifier {} referrer {} ", specifier, referrer);
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
let load = RecursiveModuleLoad::dynamic_import(
|
|
|
|
id,
|
|
|
|
specifier,
|
|
|
|
referrer,
|
|
|
|
self.loader.clone(),
|
|
|
|
);
|
|
|
|
self.waker.wake();
|
|
|
|
self.pending_dyn_imports.push(load.into_future());
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
fn dyn_import_error(
|
2020-01-07 06:45:44 -05:00
|
|
|
&mut self,
|
|
|
|
id: DynImportId,
|
2020-01-25 08:31:42 -05:00
|
|
|
err: ErrBox,
|
2020-01-07 06:45:44 -05:00
|
|
|
) -> Result<(), ErrBox> {
|
|
|
|
let isolate = self.core_isolate.v8_isolate.as_ref().unwrap();
|
|
|
|
let mut locker = v8::Locker::new(isolate);
|
2020-01-21 14:24:31 -05:00
|
|
|
let mut hs = v8::HandleScope::new(locker.enter());
|
2020-01-07 06:45:44 -05:00
|
|
|
let scope = hs.enter();
|
2020-01-21 14:24:31 -05:00
|
|
|
let context = self.core_isolate.global_context.get(scope).unwrap();
|
|
|
|
let mut cs = v8::ContextScope::new(scope, context);
|
|
|
|
let scope = cs.enter();
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
let mut resolver_handle = self
|
|
|
|
.dyn_import_map
|
|
|
|
.remove(&id)
|
|
|
|
.expect("Invalid dyn import id");
|
2020-01-07 06:45:44 -05:00
|
|
|
let mut resolver = resolver_handle.get(scope).unwrap();
|
|
|
|
resolver_handle.reset(scope);
|
2020-01-21 14:24:31 -05:00
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
let exception = match ErrBox::downcast::<ErrWithV8Handle>(err) {
|
|
|
|
Ok(mut err) => {
|
|
|
|
let handle = err.get_handle();
|
|
|
|
let exception = handle.get(scope).unwrap();
|
|
|
|
handle.reset(scope);
|
|
|
|
exception
|
|
|
|
}
|
|
|
|
Err(err) => {
|
|
|
|
let message = err.to_string();
|
|
|
|
let message = v8::String::new(scope, &message).unwrap();
|
|
|
|
v8::Exception::type_error(scope, message)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
resolver.reject(context, exception).unwrap();
|
2020-01-21 14:24:31 -05:00
|
|
|
scope.isolate().run_microtasks();
|
2020-01-25 08:31:42 -05:00
|
|
|
Ok(())
|
2020-01-11 04:49:16 -05:00
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
fn dyn_import_done(
|
|
|
|
&mut self,
|
|
|
|
id: DynImportId,
|
|
|
|
mod_id: ModuleId,
|
|
|
|
) -> Result<(), ErrBox> {
|
|
|
|
debug!("dyn_import_done {} {:?}", id, mod_id);
|
|
|
|
assert!(mod_id != 0);
|
|
|
|
let isolate = self.core_isolate.v8_isolate.as_ref().unwrap();
|
|
|
|
let mut locker = v8::Locker::new(isolate);
|
2020-01-21 14:24:31 -05:00
|
|
|
let mut hs = v8::HandleScope::new(locker.enter());
|
2020-01-11 04:49:16 -05:00
|
|
|
let scope = hs.enter();
|
|
|
|
assert!(!self.core_isolate.global_context.is_empty());
|
2020-01-21 14:24:31 -05:00
|
|
|
let context = self.core_isolate.global_context.get(scope).unwrap();
|
|
|
|
let mut cs = v8::ContextScope::new(scope, context);
|
|
|
|
let scope = cs.enter();
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
let mut resolver_handle = self
|
|
|
|
.dyn_import_map
|
|
|
|
.remove(&id)
|
|
|
|
.expect("Invalid dyn import id");
|
|
|
|
let mut resolver = resolver_handle.get(scope).unwrap();
|
|
|
|
resolver_handle.reset(scope);
|
|
|
|
let info = self
|
|
|
|
.modules
|
|
|
|
.get_info(mod_id)
|
|
|
|
.expect("Dyn import module info not found");
|
|
|
|
// Resolution success
|
|
|
|
let mut module = info.handle.get(scope).unwrap();
|
|
|
|
assert_eq!(module.get_status(), v8::ModuleStatus::Evaluated);
|
|
|
|
let module_namespace = module.get_module_namespace();
|
|
|
|
resolver.resolve(context, module_namespace).unwrap();
|
2020-01-21 14:24:31 -05:00
|
|
|
scope.isolate().run_microtasks();
|
2020-01-25 08:31:42 -05:00
|
|
|
Ok(())
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn poll_dyn_imports(&mut self, cx: &mut Context) -> Poll<Result<(), ErrBox>> {
|
|
|
|
loop {
|
|
|
|
match self.pending_dyn_imports.poll_next_unpin(cx) {
|
|
|
|
Poll::Pending | Poll::Ready(None) => {
|
|
|
|
// There are no active dynamic import loaders, or none are ready.
|
|
|
|
return Poll::Ready(Ok(()));
|
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
Poll::Ready(Some(load_stream_poll)) => {
|
|
|
|
let maybe_result = load_stream_poll.0;
|
|
|
|
let mut load = load_stream_poll.1;
|
|
|
|
let dyn_import_id = load.dyn_import_id.unwrap();
|
|
|
|
|
|
|
|
if let Some(load_stream_result) = maybe_result {
|
|
|
|
match load_stream_result {
|
|
|
|
Ok(info) => {
|
|
|
|
// A module (not necessarily the one dynamically imported) has been
|
|
|
|
// fetched. Create and register it, and if successful, poll for the
|
|
|
|
// next recursive-load event related to this dynamic import.
|
|
|
|
match self.register_during_load(info, &mut load) {
|
|
|
|
Ok(()) => {
|
|
|
|
// Keep importing until it's fully drained
|
|
|
|
self.pending_dyn_imports.push(load.into_future());
|
|
|
|
}
|
2020-01-25 08:31:42 -05:00
|
|
|
Err(err) => self.dyn_import_error(dyn_import_id, err)?,
|
2020-01-08 09:06:04 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(err) => {
|
|
|
|
// A non-javascript error occurred; this could be due to a an invalid
|
|
|
|
// module specifier, or a problem with the source map, or a failure
|
|
|
|
// to fetch the module source code.
|
2020-01-25 08:31:42 -05:00
|
|
|
self.dyn_import_error(dyn_import_id, err)?
|
2020-01-08 09:06:04 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// The top-level module from a dynamic import has been instantiated.
|
|
|
|
// Load is done.
|
|
|
|
let module_id = load.root_module_id.unwrap();
|
|
|
|
self.mod_instantiate(module_id)?;
|
2020-01-25 08:31:42 -05:00
|
|
|
match self.mod_evaluate(module_id) {
|
|
|
|
Ok(()) => self.dyn_import_done(dyn_import_id, module_id)?,
|
|
|
|
Err(err) => self.dyn_import_error(dyn_import_id, err)?,
|
|
|
|
};
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
|
|
|
|
fn register_during_load(
|
|
|
|
&mut self,
|
|
|
|
info: SourceCodeInfo,
|
|
|
|
load: &mut RecursiveModuleLoad,
|
|
|
|
) -> Result<(), ErrBox> {
|
|
|
|
let SourceCodeInfo {
|
|
|
|
code,
|
|
|
|
module_url_specified,
|
|
|
|
module_url_found,
|
|
|
|
} = info;
|
|
|
|
|
|
|
|
let is_main =
|
|
|
|
load.state == LoadState::LoadingRoot && !load.is_dynamic_import();
|
|
|
|
let referrer_name = &module_url_found.to_string();
|
|
|
|
let referrer_specifier =
|
|
|
|
ModuleSpecifier::resolve_url(referrer_name).unwrap();
|
|
|
|
|
|
|
|
// #A There are 3 cases to handle at this moment:
|
|
|
|
// 1. Source code resolved result have the same module name as requested
|
|
|
|
// and is not yet registered
|
|
|
|
// -> register
|
|
|
|
// 2. Source code resolved result have a different name as requested:
|
|
|
|
// 2a. The module with resolved module name has been registered
|
|
|
|
// -> alias
|
|
|
|
// 2b. The module with resolved module name has not yet been registerd
|
|
|
|
// -> register & alias
|
|
|
|
|
|
|
|
// If necessary, register an alias.
|
|
|
|
if module_url_specified != module_url_found {
|
|
|
|
self.modules.alias(&module_url_specified, &module_url_found);
|
|
|
|
}
|
|
|
|
|
|
|
|
let module_id = match self.modules.get_id(&module_url_found) {
|
|
|
|
Some(id) => {
|
|
|
|
// Module has already been registered.
|
|
|
|
debug!(
|
|
|
|
"Already-registered module fetched again: {}",
|
|
|
|
module_url_found
|
|
|
|
);
|
|
|
|
id
|
|
|
|
}
|
|
|
|
// Module not registered yet, do it now.
|
|
|
|
None => self.mod_new(is_main, &module_url_found, &code)?,
|
|
|
|
};
|
|
|
|
|
|
|
|
// Now we must iterate over all imports of the module and load them.
|
2020-01-25 12:53:16 -05:00
|
|
|
let imports = self.modules.get_children(module_id).unwrap();
|
|
|
|
|
|
|
|
for module_specifier in imports {
|
|
|
|
if !self.modules.is_registered(module_specifier) {
|
|
|
|
load
|
|
|
|
.add_import(module_specifier.to_owned(), referrer_specifier.clone());
|
2020-01-08 09:06:04 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we just finished loading the root module, store the root module id.
|
|
|
|
if load.state == LoadState::LoadingRoot {
|
|
|
|
load.root_module_id = Some(module_id);
|
|
|
|
load.state = LoadState::LoadingImports;
|
|
|
|
}
|
|
|
|
|
|
|
|
if load.pending.is_empty() {
|
|
|
|
load.state = LoadState::Done;
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2020-01-11 04:49:16 -05:00
|
|
|
/// Asynchronously load specified module and all of it's dependencies
|
|
|
|
///
|
|
|
|
/// User must call `Isolate::mod_evaluate` with returned `ModuleId`
|
|
|
|
/// manually after load is finished.
|
2020-01-08 09:06:04 -05:00
|
|
|
pub async fn load_module(
|
|
|
|
&mut self,
|
|
|
|
specifier: &str,
|
|
|
|
code: Option<String>,
|
|
|
|
) -> Result<ModuleId, ErrBox> {
|
|
|
|
let mut load =
|
|
|
|
RecursiveModuleLoad::main(specifier, code, self.loader.clone());
|
|
|
|
|
|
|
|
while let Some(info_result) = load.next().await {
|
|
|
|
let info = info_result?;
|
|
|
|
self.register_during_load(info, &mut load)?;
|
|
|
|
}
|
|
|
|
|
|
|
|
let root_id = load.root_module_id.expect("Root module id empty");
|
|
|
|
self.mod_instantiate(root_id).map(|_| root_id)
|
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Future for EsIsolate {
|
|
|
|
type Output = Result<(), ErrBox>;
|
|
|
|
|
|
|
|
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
|
|
|
let inner = self.get_mut();
|
|
|
|
|
|
|
|
inner.waker.register(cx.waker());
|
|
|
|
|
|
|
|
// If there are any pending dyn_import futures, do those first.
|
|
|
|
if !inner.pending_dyn_imports.is_empty() {
|
|
|
|
let poll_imports = inner.poll_dyn_imports(cx)?;
|
|
|
|
assert!(poll_imports.is_ready());
|
|
|
|
}
|
|
|
|
|
|
|
|
match ready!(inner.core_isolate.poll_unpin(cx)) {
|
|
|
|
Ok(()) => {
|
|
|
|
if inner.pending_dyn_imports.is_empty() {
|
|
|
|
Poll::Ready(Ok(()))
|
|
|
|
} else {
|
|
|
|
Poll::Pending
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(e) => Poll::Ready(Err(e)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
pub mod tests {
|
|
|
|
use super::*;
|
|
|
|
use crate::isolate::js_check;
|
|
|
|
use crate::isolate::tests::run_in_task;
|
2020-01-24 15:10:49 -05:00
|
|
|
use crate::isolate::ZeroCopyBuf;
|
2020-01-08 09:06:04 -05:00
|
|
|
use crate::modules::SourceCodeInfoFuture;
|
2020-01-07 06:45:44 -05:00
|
|
|
use crate::ops::*;
|
|
|
|
use std::io;
|
|
|
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
#[test]
|
|
|
|
fn test_mods() {
|
|
|
|
#[derive(Clone, Default)]
|
|
|
|
struct ModsLoader {
|
|
|
|
pub count: Arc<AtomicUsize>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Loader for ModsLoader {
|
|
|
|
fn resolve(
|
|
|
|
&self,
|
|
|
|
specifier: &str,
|
|
|
|
referrer: &str,
|
|
|
|
_is_main: bool,
|
|
|
|
) -> Result<ModuleSpecifier, ErrBox> {
|
|
|
|
self.count.fetch_add(1, Ordering::Relaxed);
|
|
|
|
assert_eq!(specifier, "./b.js");
|
|
|
|
assert_eq!(referrer, "file:///a.js");
|
|
|
|
let s = ModuleSpecifier::resolve_import(specifier, referrer).unwrap();
|
|
|
|
Ok(s)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn load(
|
|
|
|
&self,
|
|
|
|
_module_specifier: &ModuleSpecifier,
|
|
|
|
_maybe_referrer: Option<ModuleSpecifier>,
|
2020-01-25 12:53:16 -05:00
|
|
|
_is_dyn_import: bool,
|
2020-01-08 09:06:04 -05:00
|
|
|
) -> Pin<Box<SourceCodeInfoFuture>> {
|
|
|
|
unreachable!()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let loader = Box::new(ModsLoader::default());
|
|
|
|
let resolve_count = loader.count.clone();
|
2020-01-07 06:45:44 -05:00
|
|
|
let dispatch_count = Arc::new(AtomicUsize::new(0));
|
|
|
|
let dispatch_count_ = dispatch_count.clone();
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
let mut isolate = EsIsolate::new(loader, StartupData::None, false);
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
let dispatcher =
|
2020-01-24 15:10:49 -05:00
|
|
|
move |control: &[u8], _zero_copy: Option<ZeroCopyBuf>| -> CoreOp {
|
2020-01-07 06:45:44 -05:00
|
|
|
dispatch_count_.fetch_add(1, Ordering::Relaxed);
|
|
|
|
assert_eq!(control.len(), 1);
|
|
|
|
assert_eq!(control[0], 42);
|
|
|
|
let buf = vec![43u8, 0, 0, 0].into_boxed_slice();
|
|
|
|
Op::Async(futures::future::ok(buf).boxed())
|
|
|
|
};
|
|
|
|
|
|
|
|
isolate.register_op("test", dispatcher);
|
|
|
|
|
|
|
|
js_check(isolate.execute(
|
|
|
|
"setup.js",
|
|
|
|
r#"
|
|
|
|
function assert(cond) {
|
|
|
|
if (!cond) {
|
|
|
|
throw Error("assert");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
));
|
2020-01-08 09:06:04 -05:00
|
|
|
|
2020-01-07 06:45:44 -05:00
|
|
|
assert_eq!(dispatch_count.load(Ordering::Relaxed), 0);
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
let specifier_a = "file:///a.js".to_string();
|
2020-01-07 06:45:44 -05:00
|
|
|
let mod_a = isolate
|
|
|
|
.mod_new(
|
|
|
|
true,
|
2020-01-08 09:06:04 -05:00
|
|
|
&specifier_a,
|
2020-01-07 06:45:44 -05:00
|
|
|
r#"
|
2020-01-08 09:06:04 -05:00
|
|
|
import { b } from './b.js'
|
2020-01-07 06:45:44 -05:00
|
|
|
if (b() != 'b') throw Error();
|
|
|
|
let control = new Uint8Array([42]);
|
|
|
|
Deno.core.send(1, control);
|
|
|
|
"#,
|
|
|
|
)
|
|
|
|
.unwrap();
|
|
|
|
assert_eq!(dispatch_count.load(Ordering::Relaxed), 0);
|
|
|
|
|
2020-01-25 12:53:16 -05:00
|
|
|
let imports = isolate.modules.get_children(mod_a);
|
|
|
|
assert_eq!(
|
|
|
|
imports,
|
|
|
|
Some(&vec![ModuleSpecifier::resolve_url("file:///b.js").unwrap()])
|
|
|
|
);
|
2020-01-07 06:45:44 -05:00
|
|
|
let mod_b = isolate
|
2020-01-08 09:06:04 -05:00
|
|
|
.mod_new(false, "file:///b.js", "export function b() { return 'b' }")
|
2020-01-07 06:45:44 -05:00
|
|
|
.unwrap();
|
2020-01-25 12:53:16 -05:00
|
|
|
let imports = isolate.modules.get_children(mod_b).unwrap();
|
2020-01-07 06:45:44 -05:00
|
|
|
assert_eq!(imports.len(), 0);
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
js_check(isolate.mod_instantiate(mod_b));
|
2020-01-07 06:45:44 -05:00
|
|
|
assert_eq!(dispatch_count.load(Ordering::Relaxed), 0);
|
2020-01-25 12:53:16 -05:00
|
|
|
assert_eq!(resolve_count.load(Ordering::SeqCst), 1);
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
js_check(isolate.mod_instantiate(mod_a));
|
2020-01-07 06:45:44 -05:00
|
|
|
assert_eq!(dispatch_count.load(Ordering::Relaxed), 0);
|
|
|
|
|
|
|
|
js_check(isolate.mod_evaluate(mod_a));
|
|
|
|
assert_eq!(dispatch_count.load(Ordering::Relaxed), 1);
|
|
|
|
}
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
#[test]
|
|
|
|
fn dyn_import_err() {
|
|
|
|
#[derive(Clone, Default)]
|
|
|
|
struct DynImportErrLoader {
|
|
|
|
pub count: Arc<AtomicUsize>,
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
impl Loader for DynImportErrLoader {
|
|
|
|
fn resolve(
|
|
|
|
&self,
|
|
|
|
specifier: &str,
|
|
|
|
referrer: &str,
|
|
|
|
_is_main: bool,
|
|
|
|
) -> Result<ModuleSpecifier, ErrBox> {
|
|
|
|
self.count.fetch_add(1, Ordering::Relaxed);
|
|
|
|
assert_eq!(specifier, "/foo.js");
|
|
|
|
assert_eq!(referrer, "file:///dyn_import2.js");
|
|
|
|
let s = ModuleSpecifier::resolve_import(specifier, referrer).unwrap();
|
|
|
|
Ok(s)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn load(
|
|
|
|
&self,
|
|
|
|
_module_specifier: &ModuleSpecifier,
|
|
|
|
_maybe_referrer: Option<ModuleSpecifier>,
|
2020-01-25 12:53:16 -05:00
|
|
|
_is_dyn_import: bool,
|
2020-01-08 09:06:04 -05:00
|
|
|
) -> Pin<Box<SourceCodeInfoFuture>> {
|
|
|
|
async { Err(ErrBox::from(io::Error::from(io::ErrorKind::NotFound))) }
|
|
|
|
.boxed()
|
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Test an erroneous dynamic import where the specified module isn't found.
|
|
|
|
run_in_task(|cx| {
|
2020-01-08 09:06:04 -05:00
|
|
|
let loader = Box::new(DynImportErrLoader::default());
|
|
|
|
let count = loader.count.clone();
|
|
|
|
let mut isolate = EsIsolate::new(loader, StartupData::None, false);
|
|
|
|
|
2020-01-07 06:45:44 -05:00
|
|
|
js_check(isolate.execute(
|
2020-01-08 09:06:04 -05:00
|
|
|
"file:///dyn_import2.js",
|
2020-01-07 06:45:44 -05:00
|
|
|
r#"
|
|
|
|
(async () => {
|
2020-01-08 09:06:04 -05:00
|
|
|
await import("/foo.js");
|
2020-01-07 06:45:44 -05:00
|
|
|
})();
|
|
|
|
"#,
|
|
|
|
));
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(count.load(Ordering::Relaxed), 0);
|
2020-01-07 06:45:44 -05:00
|
|
|
// We should get an error here.
|
|
|
|
let result = isolate.poll_unpin(cx);
|
|
|
|
if let Poll::Ready(Ok(_)) = result {
|
|
|
|
unreachable!();
|
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(count.load(Ordering::Relaxed), 1);
|
2020-01-07 06:45:44 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-01-25 08:31:42 -05:00
|
|
|
/*
|
|
|
|
// Note from Bert: I do not understand how this part is supposed to pass.
|
|
|
|
// For me all these modules load in parallel and, unless I'm missing
|
|
|
|
// something, that's how it should be. So I disabled the test for now.
|
2020-01-07 06:45:44 -05:00
|
|
|
#[test]
|
|
|
|
fn dyn_import_err2() {
|
2020-01-08 09:06:04 -05:00
|
|
|
#[derive(Clone, Default)]
|
|
|
|
struct DynImportErr2Loader {
|
|
|
|
pub count: Arc<AtomicUsize>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Loader for DynImportErr2Loader {
|
|
|
|
fn resolve(
|
|
|
|
&self,
|
|
|
|
specifier: &str,
|
|
|
|
referrer: &str,
|
|
|
|
_is_main: bool,
|
|
|
|
_is_dyn_import: bool,
|
|
|
|
) -> Result<ModuleSpecifier, ErrBox> {
|
|
|
|
let c = self.count.fetch_add(1, Ordering::Relaxed);
|
2020-01-07 06:45:44 -05:00
|
|
|
match c {
|
2020-01-08 09:06:04 -05:00
|
|
|
0 => assert_eq!(specifier, "/foo1.js"),
|
|
|
|
1 => assert_eq!(specifier, "/foo2.js"),
|
|
|
|
2 => assert_eq!(specifier, "/foo3.js"),
|
2020-01-07 06:45:44 -05:00
|
|
|
_ => unreachable!(),
|
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(referrer, "file:///dyn_import_error.js");
|
|
|
|
let s = ModuleSpecifier::resolve_import(specifier, referrer).unwrap();
|
|
|
|
Ok(s)
|
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
fn load(
|
|
|
|
&self,
|
|
|
|
specifier: &ModuleSpecifier,
|
|
|
|
_maybe_referrer: Option<ModuleSpecifier>,
|
|
|
|
) -> Pin<Box<SourceCodeInfoFuture>> {
|
|
|
|
let info = SourceCodeInfo {
|
|
|
|
module_url_specified: specifier.to_string(),
|
|
|
|
module_url_found: specifier.to_string(),
|
2020-01-07 06:45:44 -05:00
|
|
|
code: "# not valid JS".to_owned(),
|
|
|
|
};
|
2020-01-08 09:06:04 -05:00
|
|
|
async move { Ok(info) }.boxed()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Import multiple modules to demonstrate that after failed dynamic import
|
|
|
|
// another dynamic import can still be run
|
|
|
|
run_in_task(|cx| {
|
|
|
|
let loader = Box::new(DynImportErr2Loader::default());
|
|
|
|
let loader1 = loader.clone();
|
|
|
|
let mut isolate = EsIsolate::new(loader, StartupData::None, false);
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
js_check(isolate.execute(
|
2020-01-08 09:06:04 -05:00
|
|
|
"file:///dyn_import_error.js",
|
2020-01-07 06:45:44 -05:00
|
|
|
r#"
|
|
|
|
(async () => {
|
2020-01-08 09:06:04 -05:00
|
|
|
await import("/foo1.js");
|
2020-01-07 06:45:44 -05:00
|
|
|
})();
|
|
|
|
(async () => {
|
2020-01-08 09:06:04 -05:00
|
|
|
await import("/foo2.js");
|
2020-01-07 06:45:44 -05:00
|
|
|
})();
|
|
|
|
(async () => {
|
2020-01-08 09:06:04 -05:00
|
|
|
await import("/foo3.js");
|
2020-01-07 06:45:44 -05:00
|
|
|
})();
|
|
|
|
"#,
|
|
|
|
));
|
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(loader1.count.load(Ordering::Relaxed), 0);
|
2020-01-07 06:45:44 -05:00
|
|
|
// Now each poll should return error
|
|
|
|
assert!(match isolate.poll_unpin(cx) {
|
|
|
|
Poll::Ready(Err(_)) => true,
|
|
|
|
_ => false,
|
|
|
|
});
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(loader1.count.load(Ordering::Relaxed), 1);
|
2020-01-07 06:45:44 -05:00
|
|
|
assert!(match isolate.poll_unpin(cx) {
|
|
|
|
Poll::Ready(Err(_)) => true,
|
|
|
|
_ => false,
|
|
|
|
});
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(loader1.count.load(Ordering::Relaxed), 2);
|
2020-01-07 06:45:44 -05:00
|
|
|
assert!(match isolate.poll_unpin(cx) {
|
|
|
|
Poll::Ready(Err(_)) => true,
|
|
|
|
_ => false,
|
|
|
|
});
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(loader1.count.load(Ordering::Relaxed), 3);
|
2020-01-07 06:45:44 -05:00
|
|
|
})
|
|
|
|
}
|
2020-01-25 08:31:42 -05:00
|
|
|
*/
|
2020-01-07 06:45:44 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn dyn_import_ok() {
|
2020-01-08 09:06:04 -05:00
|
|
|
#[derive(Clone, Default)]
|
|
|
|
struct DynImportOkLoader {
|
|
|
|
pub resolve_count: Arc<AtomicUsize>,
|
|
|
|
pub load_count: Arc<AtomicUsize>,
|
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
impl Loader for DynImportOkLoader {
|
|
|
|
fn resolve(
|
|
|
|
&self,
|
|
|
|
specifier: &str,
|
|
|
|
referrer: &str,
|
|
|
|
_is_main: bool,
|
|
|
|
) -> Result<ModuleSpecifier, ErrBox> {
|
|
|
|
let c = self.resolve_count.fetch_add(1, Ordering::Relaxed);
|
2020-01-07 06:45:44 -05:00
|
|
|
match c {
|
2020-01-08 09:06:04 -05:00
|
|
|
0 => assert_eq!(specifier, "./b.js"),
|
|
|
|
1 => assert_eq!(specifier, "./b.js"),
|
2020-01-07 06:45:44 -05:00
|
|
|
_ => unreachable!(),
|
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(referrer, "file:///dyn_import3.js");
|
|
|
|
let s = ModuleSpecifier::resolve_import(specifier, referrer).unwrap();
|
|
|
|
Ok(s)
|
|
|
|
}
|
2020-01-07 06:45:44 -05:00
|
|
|
|
2020-01-08 09:06:04 -05:00
|
|
|
fn load(
|
|
|
|
&self,
|
|
|
|
specifier: &ModuleSpecifier,
|
|
|
|
_maybe_referrer: Option<ModuleSpecifier>,
|
2020-01-25 12:53:16 -05:00
|
|
|
_is_dyn_import: bool,
|
2020-01-08 09:06:04 -05:00
|
|
|
) -> Pin<Box<SourceCodeInfoFuture>> {
|
|
|
|
self.load_count.fetch_add(1, Ordering::Relaxed);
|
|
|
|
let info = SourceCodeInfo {
|
|
|
|
module_url_specified: specifier.to_string(),
|
|
|
|
module_url_found: specifier.to_string(),
|
|
|
|
code: "export function b() { return 'b' }".to_owned(),
|
|
|
|
};
|
|
|
|
async move { Ok(info) }.boxed()
|
2020-01-07 06:45:44 -05:00
|
|
|
}
|
2020-01-08 09:06:04 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
run_in_task(|cx| {
|
|
|
|
let loader = Box::new(DynImportOkLoader::default());
|
|
|
|
let resolve_count = loader.resolve_count.clone();
|
|
|
|
let load_count = loader.load_count.clone();
|
|
|
|
let mut isolate = EsIsolate::new(loader, StartupData::None, false);
|
|
|
|
|
2020-01-07 06:45:44 -05:00
|
|
|
// Dynamically import mod_b
|
|
|
|
js_check(isolate.execute(
|
2020-01-08 09:06:04 -05:00
|
|
|
"file:///dyn_import3.js",
|
2020-01-07 06:45:44 -05:00
|
|
|
r#"
|
|
|
|
(async () => {
|
2020-01-08 09:06:04 -05:00
|
|
|
let mod = await import("./b.js");
|
2020-01-07 06:45:44 -05:00
|
|
|
if (mod.b() !== 'b') {
|
|
|
|
throw Error("bad1");
|
|
|
|
}
|
|
|
|
// And again!
|
2020-01-08 09:06:04 -05:00
|
|
|
mod = await import("./b.js");
|
2020-01-07 06:45:44 -05:00
|
|
|
if (mod.b() !== 'b') {
|
|
|
|
throw Error("bad2");
|
|
|
|
}
|
|
|
|
})();
|
|
|
|
"#,
|
|
|
|
));
|
|
|
|
|
|
|
|
assert!(match isolate.poll_unpin(cx) {
|
|
|
|
Poll::Ready(Ok(_)) => true,
|
|
|
|
_ => false,
|
|
|
|
});
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(resolve_count.load(Ordering::Relaxed), 2);
|
|
|
|
assert_eq!(load_count.load(Ordering::Relaxed), 2);
|
2020-01-07 06:45:44 -05:00
|
|
|
assert!(match isolate.poll_unpin(cx) {
|
|
|
|
Poll::Ready(Ok(_)) => true,
|
|
|
|
_ => false,
|
|
|
|
});
|
2020-01-08 09:06:04 -05:00
|
|
|
assert_eq!(resolve_count.load(Ordering::Relaxed), 2);
|
|
|
|
assert_eq!(load_count.load(Ordering::Relaxed), 2);
|
2020-01-07 06:45:44 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|