Fix snapshots getting around panic stub

Author: rscarson

.gitignore

@@ -1,3 +1,4 @@
 /target
 .vscode
-.idea
+.idea
+snapshot.bin

Cargo.lock

@@ -3,7 +3,7 @@ name = "rustyscript"
 description = "Effortless JS Integration for Rust"
 edition = "2021"
 license = "MIT OR Apache-2.0"
-version = "0.6.3"
+version = "0.6.4"
 repository = "https://github.com/rscarson/rustyscript"
 
 keywords = ["rust", "javascript", "deno", "runtime", "embedding"]

Cargo.toml

@@ -1,4 +1,4 @@
-use rustyscript::Runtime;
+use rustyscript::{Runtime, RuntimeOptions};
 
 fn main() {
     interactive_prompt()
@@ -13,7 +13,10 @@ fn interactive_prompt() {
         stack.insert(0, "exit".to_string());
     }
 
-    let mut runtime = Runtime::new(Default::default()).expect("Failed to create runtime");
+    let mut runtime = Runtime::new(RuntimeOptions {
+        ..Default::default()
+    })
+    .expect("Failed to create runtime");
 
     loop {
         // Make sure we have a command ready

examples/interactive_prompt.rs

@@ -80,6 +80,7 @@ export const whitelist = {
     "op_register_entrypoint": "Rustyscript builtin",
     "call_registered_function": "Rustyscript builtin",
     "call_registered_function_async": "Rustyscript builtin",
+    "op_panic2": "Panic stub to replace op_panic",
 
     //
     // v8 ops

src/ext/op_whitelist.js

@@ -1,5 +1,5 @@
 use crate::{error::Error, RsAsyncFunction, RsFunction};
-use deno_core::{extension, op2, serde_json, v8, Extension, OpState};
+use deno_core::{anyhow::anyhow, extension, op2, serde_json, v8, Extension, OpState};
 use std::collections::HashMap;
 
 type FnCache = HashMap<String, Box<dyn RsFunction>>;
@@ -52,9 +52,14 @@ fn call_registered_function_async(
     Box::pin(std::future::ready(Err(Error::ValueNotCallable(name))))
 }
 
+#[op2(fast)]
+fn op_panic2(#[string] msg: &str) -> Result<(), deno_core::anyhow::Error> {
+    Err(anyhow!(msg.to_string()))
+}
+
 extension!(
     rustyscript,
-    ops = [op_register_entrypoint, call_registered_function, call_registered_function_async],
+    ops = [op_register_entrypoint, call_registered_function, call_registered_function_async, op_panic2],
     esm_entry_point = "ext:rustyscript/rustyscript.js",
     esm = [ dir "src/ext/rustyscript", "rustyscript.js" ],
 );

src/ext/rustyscript/mod.rs

@@ -51,9 +51,6 @@ globalThis.rustyscript = {
 };
 Object.freeze(globalThis.rustyscript);
 
-// Stub out the panic function
-Deno.core.ops.op_panic = (msg) => { throw new Error(msg) };
-
 export {
     nonEnumerable, readOnly, writeable, getterOnly, applyToGlobal
 };

src/ext/rustyscript/rustyscript.js

@@ -131,7 +131,7 @@ pub struct InnerRuntime {
 }
 impl InnerRuntime {
     pub fn new(options: RuntimeOptions) -> Result<Self, Error> {
-        let loader = Rc::new(RustyLoader::new(options.module_cache));
+        let module_loader = Rc::new(RustyLoader::new(options.module_cache));
 
         // If a snapshot is provided, do not reload ops
         let extensions = if options.startup_snapshot.is_some() {
@@ -140,26 +140,31 @@ impl InnerRuntime {
             ext::all_extensions(options.extensions, options.extension_options)
         };
 
-        Ok(Self {
-            deno_runtime: JsRuntime::try_new(deno_core::RuntimeOptions {
-                module_loader: Some(loader.clone()),
+        let mut deno_runtime = JsRuntime::try_new(deno_core::RuntimeOptions {
+            module_loader: Some(module_loader.clone()),
 
-                extension_transpiler: Some(Rc::new(|specifier, code| {
-                    transpile_extension(&specifier, &code)
-                })),
+            extension_transpiler: Some(Rc::new(|specifier, code| {
+                transpile_extension(&specifier, &code)
+            })),
 
-                source_map_getter: Some(loader.clone()),
-                create_params: options.isolate_params,
-                shared_array_buffer_store: options.shared_array_buffer_store,
+            source_map_getter: Some(module_loader.clone()),
+            create_params: options.isolate_params,
+            shared_array_buffer_store: options.shared_array_buffer_store,
 
-                startup_snapshot: options.startup_snapshot,
-                extensions,
+            startup_snapshot: options.startup_snapshot,
+            extensions,
 
-                ..Default::default()
-            })?,
+            ..Default::default()
+        })?;
 
-            module_loader: loader,
+        // Stub out bad and naughty functions
+        deno_runtime
+            .execute_script("", "Deno.core.ops.op_panic = Deno.core.ops.op_panic2;")
+            .map_err(|e| Error::Runtime(format!("Could not initialize sandbox: {e}")))?;
 
+        Ok(Self {
+            deno_runtime,
+            module_loader,
             options: RuntimeOptions {
                 timeout: options.timeout,
                 default_entrypoint: options.default_entrypoint,