diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/examples/hello_runtime.rs | 2 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 34 | ||||
| -rw-r--r-- | runtime/worker.rs | 64 |
3 files changed, 80 insertions, 20 deletions
diff --git a/runtime/examples/hello_runtime.rs b/runtime/examples/hello_runtime.rs index 9ac1d0a27..db6394694 100644 --- a/runtime/examples/hello_runtime.rs +++ b/runtime/examples/hello_runtime.rs @@ -57,7 +57,7 @@ async fn main() -> Result<(), AnyError> { let mut worker = MainWorker::from_options(main_module.clone(), permissions, &options); worker.bootstrap(&options); - worker.execute_module(&main_module).await?; + worker.execute_main_module(&main_module).await?; worker.run_event_loop(false).await?; Ok(()) } diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index ed7b95f5b..975028b16 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -458,21 +458,32 @@ impl WebWorker { Ok(()) } - /// Loads and instantiates specified JavaScript module. + /// Loads and instantiates specified JavaScript module + /// as "main" or "side" module. pub async fn preload_module( &mut self, module_specifier: &ModuleSpecifier, + main: bool, ) -> Result<ModuleId, AnyError> { - self.js_runtime.load_module(module_specifier, None).await + if main { + self + .js_runtime + .load_main_module(module_specifier, None) + .await + } else { + self + .js_runtime + .load_side_module(module_specifier, None) + .await + } } /// Loads, instantiates and executes specified JavaScript module. - pub async fn execute_module( + pub async fn execute_main_module( &mut self, module_specifier: &ModuleSpecifier, ) -> Result<(), AnyError> { - let id = self.preload_module(module_specifier).await?; - + let id = self.preload_module(module_specifier, true).await?; let mut receiver = self.js_runtime.mod_evaluate(id); tokio::select! { maybe_result = &mut receiver => { @@ -494,6 +505,17 @@ impl WebWorker { } } + #[deprecated( + since = "0.26.0", + note = "This method had a bug, marking multiple modules loaded as \"main\". Use `execute_main_module`." + )] + pub async fn execute_module( + &mut self, + module_specifier: &ModuleSpecifier, + ) -> Result<(), AnyError> { + self.execute_main_module(module_specifier).await + } + pub fn poll_event_loop( &mut self, cx: &mut Context, @@ -568,7 +590,7 @@ pub fn run_web_worker( } else { // TODO(bartlomieju): add "type": "classic", ie. ability to load // script instead of module - worker.execute_module(&specifier).await + worker.execute_main_module(&specifier).await }; let internal_handle = worker.internal_handle.clone(); diff --git a/runtime/worker.rs b/runtime/worker.rs index 92bebe92a..54b8a8d68 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -207,21 +207,27 @@ impl MainWorker { Ok(()) } - /// Loads and instantiates specified JavaScript module. + /// Loads and instantiates specified JavaScript module + /// as "main" or "side" module. pub async fn preload_module( &mut self, module_specifier: &ModuleSpecifier, + main: bool, ) -> Result<ModuleId, AnyError> { - self.js_runtime.load_module(module_specifier, None).await + if main { + self + .js_runtime + .load_main_module(module_specifier, None) + .await + } else { + self + .js_runtime + .load_side_module(module_specifier, None) + .await + } } - /// Loads, instantiates and executes specified JavaScript module. - pub async fn execute_module( - &mut self, - module_specifier: &ModuleSpecifier, - ) -> Result<(), AnyError> { - let id = self.preload_module(module_specifier).await?; - self.wait_for_inspector_session(); + async fn evaluate_module(&mut self, id: ModuleId) -> Result<(), AnyError> { let mut receiver = self.js_runtime.mod_evaluate(id); tokio::select! { maybe_result = &mut receiver => { @@ -237,6 +243,38 @@ impl MainWorker { } } + /// Loads, instantiates and executes specified JavaScript module. + pub async fn execute_side_module( + &mut self, + module_specifier: &ModuleSpecifier, + ) -> Result<(), AnyError> { + let id = self.preload_module(module_specifier, false).await?; + self.evaluate_module(id).await + } + + /// Loads, instantiates and executes specified JavaScript module. + /// + /// This module will have "import.meta.main" equal to true. + pub async fn execute_main_module( + &mut self, + module_specifier: &ModuleSpecifier, + ) -> Result<(), AnyError> { + let id = self.preload_module(module_specifier, true).await?; + self.wait_for_inspector_session(); + self.evaluate_module(id).await + } + + #[deprecated( + since = "0.26.0", + note = "This method had a bug, marking multiple modules loaded as \"main\". Use `execute_main_module` or `execute_side_module` instead." + )] + pub async fn execute_module( + &mut self, + module_specifier: &ModuleSpecifier, + ) -> Result<(), AnyError> { + self.execute_main_module(module_specifier).await + } + fn wait_for_inspector_session(&mut self) { if self.should_break_on_first_statement { self @@ -330,7 +368,7 @@ mod tests { let p = test_util::testdata_path().join("esm_imports_a.js"); let module_specifier = resolve_url_or_path(&p.to_string_lossy()).unwrap(); let mut worker = create_test_worker(); - let result = worker.execute_module(&module_specifier).await; + let result = worker.execute_main_module(&module_specifier).await; if let Err(err) = result { eprintln!("execute_mod err {:?}", err); } @@ -347,7 +385,7 @@ mod tests { .join("tests/circular1.js"); let module_specifier = resolve_url_or_path(&p.to_string_lossy()).unwrap(); let mut worker = create_test_worker(); - let result = worker.execute_module(&module_specifier).await; + let result = worker.execute_main_module(&module_specifier).await; if let Err(err) = result { eprintln!("execute_mod err {:?}", err); } @@ -361,7 +399,7 @@ mod tests { // "foo" is not a valid module specifier so this should return an error. let mut worker = create_test_worker(); let module_specifier = resolve_url_or_path("does-not-exist").unwrap(); - let result = worker.execute_module(&module_specifier).await; + let result = worker.execute_main_module(&module_specifier).await; assert!(result.is_err()); } @@ -372,7 +410,7 @@ mod tests { let mut worker = create_test_worker(); let p = test_util::testdata_path().join("001_hello.js"); let module_specifier = resolve_url_or_path(&p.to_string_lossy()).unwrap(); - let result = worker.execute_module(&module_specifier).await; + let result = worker.execute_main_module(&module_specifier).await; assert!(result.is_ok()); } } |