Deno plugins (#42)

Switch from BoaJS to Deno core

src-tauri/src/deno.rs

@@ -0,0 +1,237 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+//! This example shows how to use swc to transpile TypeScript and JSX/TSX
+//! modules.
+//!
+//! It will only transpile, not typecheck (like Deno's `--no-check` flag).
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::rc::Rc;
+use std::sync::Arc;
+
+use crate::deno_ops::op_yaml_parse;
+use anyhow::anyhow;
+use anyhow::bail;
+use anyhow::Context;
+use anyhow::Error;
+use deno_ast::ParseParams;
+use deno_ast::{EmitOptions, MediaType, SourceMapOption, TranspileOptions};
+use deno_core::error::{AnyError, JsError};
+use deno_core::resolve_path;
+use deno_core::JsRuntime;
+use deno_core::ModuleLoadResponse;
+use deno_core::ModuleLoader;
+use deno_core::ModuleSource;
+use deno_core::ModuleSourceCode;
+use deno_core::ModuleSpecifier;
+use deno_core::ModuleType;
+use deno_core::RequestedModuleType;
+use deno_core::ResolutionKind;
+use deno_core::RuntimeOptions;
+use deno_core::SourceMapGetter;
+use deno_core::{resolve_import, v8};
+use tokio::task::block_in_place;
+
+#[derive(Clone)]
+struct SourceMapStore(Rc<RefCell<HashMap<String, Vec<u8>>>>);
+
+impl SourceMapGetter for SourceMapStore {
+    fn get_source_map(&self, specifier: &str) -> Option<Vec<u8>> {
+        self.0.borrow().get(specifier).cloned()
+    }
+
+    fn get_source_line(&self, _file_name: &str, _line_number: usize) -> Option<String> {
+        None
+    }
+}
+
+struct TypescriptModuleLoader {
+    source_maps: SourceMapStore,
+}
+
+impl ModuleLoader for TypescriptModuleLoader {
+    fn resolve(
+        &self,
+        specifier: &str,
+        referrer: &str,
+        _kind: ResolutionKind,
+    ) -> Result<ModuleSpecifier, Error> {
+        Ok(resolve_import(specifier, referrer)?)
+    }
+
+    fn load(
+        &self,
+        module_specifier: &ModuleSpecifier,
+        _maybe_referrer: Option<&ModuleSpecifier>,
+        _is_dyn_import: bool,
+        _requested_module_type: RequestedModuleType,
+    ) -> ModuleLoadResponse {
+        let source_maps = self.source_maps.clone();
+        fn load(
+            source_maps: SourceMapStore,
+            module_specifier: &ModuleSpecifier,
+        ) -> Result<ModuleSource, AnyError> {
+            let path = module_specifier
+                .to_file_path()
+                .map_err(|_| anyhow!("Only file:// URLs are supported."))?;
+
+            let media_type = MediaType::from_path(&path);
+            let (module_type, should_transpile) = match MediaType::from_path(&path) {
+                MediaType::JavaScript | MediaType::Mjs | MediaType::Cjs => {
+                    (ModuleType::JavaScript, false)
+                }
+                MediaType::Jsx => (ModuleType::JavaScript, true),
+                MediaType::TypeScript
+                | MediaType::Mts
+                | MediaType::Cts
+                | MediaType::Dts
+                | MediaType::Dmts
+                | MediaType::Dcts
+                | MediaType::Tsx => (ModuleType::JavaScript, true),
+                MediaType::Json => (ModuleType::Json, false),
+                _ => bail!("Unknown extension {:?}", path.extension()),
+            };
+
+            let code = std::fs::read_to_string(&path)?;
+            let code = if should_transpile {
+                let parsed = deno_ast::parse_module(ParseParams {
+                    specifier: module_specifier.clone(),
+                    text: Arc::from(code),
+                    media_type,
+                    capture_tokens: false,
+                    scope_analysis: false,
+                    maybe_syntax: None,
+                })?;
+                let res = parsed.transpile(
+                    &TranspileOptions::default(),
+                    &EmitOptions {
+                        source_map: SourceMapOption::Separate,
+                        inline_sources: true,
+                        ..Default::default()
+                    },
+                )?;
+                let src = res.into_source();
+                let source_map = src.source_map.unwrap();
+                let source = src.source;
+                source_maps
+                    .0
+                    .borrow_mut()
+                    .insert(module_specifier.to_string(), source_map);
+                String::from_utf8(source).unwrap()
+            } else {
+                code
+            };
+
+            Ok(ModuleSource::new(
+                module_type,
+                ModuleSourceCode::String(code.into()),
+                module_specifier,
+                None,
+            ))
+        }
+
+        ModuleLoadResponse::Sync(load(source_maps, module_specifier))
+    }
+}
+
+pub fn run_plugin_deno_block(
+    plugin_index_file: &str,
+    fn_name: &str,
+    fn_args: Vec<serde_json::Value>,
+) -> Result<serde_json::Value, Error> {
+    block_in_place(|| {
+        tauri::async_runtime::block_on(run_plugin_deno_2(plugin_index_file, fn_name, fn_args))
+    })
+}
+
+deno_core::extension!(
+    yaak_runtime,
+    ops = [ op_yaml_parse ],
+    esm_entry_point = "ext:yaak_runtime/yaml.js",
+    esm = [dir "src/plugin-runtime", "yaml.js"]
+);
+
+async fn run_plugin_deno_2(
+    plugin_index_file: &str,
+    fn_name: &str,
+    fn_args: Vec<serde_json::Value>,
+) -> Result<serde_json::Value, Error> {
+    let source_map_store = SourceMapStore(Rc::new(RefCell::new(HashMap::new())));
+
+    let mut ext_console = deno_console::deno_console::init_ops_and_esm();
+    ext_console.esm_entry_point = Some("ext:deno_console/01_console.js");
+
+    let ext_yaak = yaak_runtime::init_ops_and_esm();
+
+    let mut js_runtime = JsRuntime::new(RuntimeOptions {
+        module_loader: Some(Rc::new(TypescriptModuleLoader {
+            source_maps: source_map_store.clone(),
+        })),
+        source_map_getter: Some(Rc::new(source_map_store)),
+        extensions: vec![ext_console, ext_yaak],
+        ..Default::default()
+    });
+
+    let main_module = resolve_path(
+        plugin_index_file,
+        &std::env::current_dir().context("Unable to get CWD")?,
+    )?;
+
+    // Load the main module so we can do stuff with it
+    let mod_id = js_runtime.load_main_es_module(&main_module).await?;
+    let result = js_runtime.mod_evaluate(mod_id);
+    js_runtime.run_event_loop(Default::default()).await?;
+    result.await?;
+
+    let module_namespace = js_runtime.get_module_namespace(mod_id).unwrap();
+    let scope = &mut js_runtime.handle_scope();
+    let module_namespace = v8::Local::<v8::Object>::new(scope, module_namespace);
+
+    // Get the exported function we're calling
+    let func_key = v8::String::new(scope, fn_name).unwrap();
+    let func = module_namespace.get(scope, func_key.into()).unwrap();
+    let func = v8::Local::<v8::Function>::try_from(func).unwrap();
+    let tc_scope = &mut v8::TryCatch::new(scope);
+
+    // Create Yaak context object
+    let null = v8::null(tc_scope).into();
+    let name = v8::String::new(tc_scope, "foo").unwrap().into();
+    let value = v8::String::new(tc_scope, "bar").unwrap().into();
+    let yaak_ctx: v8::Local<v8::Value> =
+        v8::Object::with_prototype_and_properties(tc_scope, null, &[name], &[value]).into();
+
+    // Create the function arguments
+    let passed_args = &mut fn_args
+        .iter()
+        .map(|a| {
+            let v: v8::Local<v8::Value> = deno_core::serde_v8::to_v8(tc_scope, a).unwrap();
+            v
+        })
+        .collect::<Vec<v8::Local<v8::Value>>>();
+
+    let all_args = &mut vec![yaak_ctx];
+    all_args.append(passed_args);
+
+    // Call the function
+    let func_res = func.call(tc_scope, module_namespace.into(), all_args);
+
+    // Catch and return any thrown errors
+    if tc_scope.has_caught() {
+        let e = tc_scope.exception().unwrap();
+        let js_error = JsError::from_v8_exception(tc_scope, e);
+        return Err(Error::msg(js_error.stack.unwrap_or_default()));
+    }
+
+    // Handle the result
+    match func_res {
+        None => Ok(serde_json::Value::Null),
+        Some(res) => {
+            if res.is_null() || res.is_undefined() {
+                Ok(serde_json::Value::Null)
+            } else {
+                let value: serde_json::Value = deno_core::serde_v8::from_v8(tc_scope, res).unwrap();
+                Ok(value)
+            }
+        }
+    }
+}

src-tauri/src/deno_ops.rs

@@ -0,0 +1,14 @@
+use deno_core::error::AnyError;
+use deno_core::op2;
+
+#[op2]
+#[serde] pub fn op_yaml_parse(#[string] text: String) -> Result<serde_json::Value, AnyError> {
+    let value = serde_yaml::from_str(&text)?;
+    Ok(value)
+}
+
+#[op2]
+#[string] pub fn op_yaml_stringify(#[serde] value: serde_json::Value) -> Result<String, AnyError> {
+    let value = serde_yaml::to_string(&value)?;
+    Ok(value)
+}

src-tauri/src/lib.rs

@@ -71,6 +71,8 @@ mod render;
 mod tauri_plugin_mac_window;
 mod updates;
 mod window_menu;
+mod deno;
+mod deno_ops;
 
 const DEFAULT_WINDOW_WIDTH: f64 = 1100.0;
 const DEFAULT_WINDOW_HEIGHT: f64 = 600.0;
@@ -118,7 +120,6 @@ async fn cmd_dismiss_notification(
     notification_id: &str,
     yaak_notifier: State<'_, Mutex<YaakNotifier>>,
 ) -> Result<(), String> {
-    info!("SEEN? {notification_id}");
     yaak_notifier.lock().await.seen(&app, notification_id).await
 }
 
@@ -736,7 +737,7 @@ async fn cmd_filter_response(
     };
 
     let body = read_to_string(response.body_path.unwrap()).unwrap();
-    let filter_result = plugin::run_plugin_filter(&w.app_handle(), plugin_name, filter, &body)
+    let filter_result = plugin::run_plugin_filter(plugin_name, filter, &body)
         .await
         .expect("Failed to run filter");
     Ok(filter_result.filtered)
@@ -759,7 +760,7 @@ async fn cmd_import_data(
         read_to_string(file_path).unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
     let file_contents = file.as_str();
     for plugin_name in plugins {
-        let v = run_plugin_import(&w.app_handle(), plugin_name, file_contents)
+        let v = run_plugin_import(plugin_name, file_contents)
             .await
             .map_err(|e| e.to_string())?;
         if let Some(r) = v {
@@ -808,13 +809,12 @@ async fn cmd_import_data(
                 }
             };
 
-            info!("Importing resources");
             for mut v in r.resources.workspaces {
                 v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeWorkspace, &mut id_map);
                 let x = upsert_workspace(&w, v).await.map_err(|e| e.to_string())?;
                 imported_resources.workspaces.push(x.clone());
-                info!("Imported workspace: {}", x.name);
             }
+            info!("Imported {} workspaces", imported_resources.workspaces.len());
 
             for mut v in r.resources.environments {
                 v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeEnvironment, &mut id_map);
@@ -825,8 +825,8 @@ async fn cmd_import_data(
                 );
                 let x = upsert_environment(&w, v).await.map_err(|e| e.to_string())?;
                 imported_resources.environments.push(x.clone());
-                info!("Imported environment: {}", x.name);
             }
+            info!("Imported {} environments", imported_resources.environments.len());
 
             for mut v in r.resources.folders {
                 v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeFolder, &mut id_map);
@@ -838,8 +838,8 @@ async fn cmd_import_data(
                 v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
                 let x = upsert_folder(&w, v).await.map_err(|e| e.to_string())?;
                 imported_resources.folders.push(x.clone());
-                info!("Imported folder: {}", x.name);
             }
+            info!("Imported {} folders", imported_resources.folders.len());
 
             for mut v in r.resources.http_requests {
                 v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeHttpRequest, &mut id_map);
@@ -853,8 +853,8 @@ async fn cmd_import_data(
                     .await
                     .map_err(|e| e.to_string())?;
                 imported_resources.http_requests.push(x.clone());
-                info!("Imported request: {}", x.name);
             }
+            info!("Imported {} http_requests", imported_resources.http_requests.len());
 
             for mut v in r.resources.grpc_requests {
                 v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeGrpcRequest, &mut id_map);
@@ -868,8 +868,8 @@ async fn cmd_import_data(
                     .await
                     .map_err(|e| e.to_string())?;
                 imported_resources.grpc_requests.push(x.clone());
-                info!("Imported request: {}", x.name);
             }
+            info!("Imported {} grpc_requests", imported_resources.grpc_requests.len());
 
             Ok(imported_resources)
         }
@@ -893,16 +893,15 @@ async fn cmd_request_to_curl(
         .await
         .map_err(|e| e.to_string())?;
     let rendered = render_request(&request, &workspace, environment.as_ref());
-    Ok(run_plugin_export_curl(&app, &rendered)?)
+    Ok(run_plugin_export_curl(&rendered)?)
 }
 
 #[tauri::command]
 async fn cmd_curl_to_request(
-    app: AppHandle,
     command: &str,
     workspace_id: &str,
 ) -> Result<HttpRequest, String> {
-    let v = run_plugin_import(&app, "importer-curl", command)
+    let v = run_plugin_import("importer-curl", command)
         .await
         .map_err(|e| e.to_string());
     match v {
@@ -1581,7 +1580,9 @@ pub fn run() {
                 .level_for("tokio_util", log::LevelFilter::Info)
                 .level_for("tonic", log::LevelFilter::Info)
                 .level_for("tower", log::LevelFilter::Info)
-                .level_for("tracing", log::LevelFilter::Info)
+                .level_for("tracing", log::LevelFilter::Warn)
+                .level_for("swc_ecma_codegen", log::LevelFilter::Off)
+                .level_for("swc_ecma_transforms_base", log::LevelFilter::Off)
                 .with_colors(ColoredLevelConfig::default())
                 .level(if is_dev() {
                     log::LevelFilter::Trace

src-tauri/src/plugin-runtime/yaml.js

@@ -0,0 +1,7 @@
+((globalThis) => {
+  const core = Deno.core;
+  globalThis.YAML = {
+    parse: core.ops.op_yaml_parse,
+    stringify: core.ops.op_yaml_stringify,
+  };
+})(globalThis);

src-tauri/src/plugin.rs

@@ -1,17 +1,9 @@
-use std::rc::Rc;
+use std::path;
 
-use boa_engine::builtins::promise::PromiseState;
-use boa_engine::{
-    js_string, module::SimpleModuleLoader, property::Attribute, Context, JsNativeError, JsValue,
-    Module, Source,
-};
-use boa_runtime::Console;
-use log::{debug, error};
+use log::error;
 use serde::{Deserialize, Serialize};
-use serde_json::json;
-use tauri::path::BaseDirectory;
-use tauri::{AppHandle, Manager};
 
+use crate::deno::run_plugin_deno_block;
 use crate::models::{HttpRequest, WorkspaceExportResources};
 
 #[derive(Default, Debug, Deserialize, Serialize)]
@@ -25,140 +17,68 @@ pub struct ImportResult {
 }
 
 pub async fn run_plugin_filter(
-    app_handle: &AppHandle,
     plugin_name: &str,
     response_body: &str,
     filter: &str,
 ) -> Option<FilterResult> {
-    let result_json = run_plugin(
-        app_handle,
-        plugin_name,
-        "pluginHookResponseFilter",
-        &[js_string!(response_body).into(), js_string!(filter).into()],
-    );
+    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
+    let plugin_index_file = plugin_dir.join(plugin_name).join("build/index.mjs");
 
-    if result_json.is_null() {
+    let result = run_plugin_deno_block(
+        plugin_index_file.to_str().unwrap(),
+        "pluginHookResponseFilter",
+        vec![
+            serde_json::to_value(response_body).unwrap(),
+            serde_json::to_value(filter).unwrap(),
+        ],
+    )
+    .map_err(|e| e.to_string())
+    .expect("Failed to run plugin");
+
+    if result.is_null() {
         error!("Plugin {} failed to run", plugin_name);
         return None;
     }
 
     let resources: FilterResult =
-        serde_json::from_value(result_json).expect("failed to parse filter plugin result json");
+        serde_json::from_value(result).expect("failed to parse filter plugin result json");
     Some(resources)
 }
 
-pub fn run_plugin_export_curl(
-    app_handle: &AppHandle,
-    request: &HttpRequest,
-) -> Result<String, String> {
-    let mut context = Context::default();
-    let request_json = serde_json::to_value(request).map_err(|e| e.to_string())?;
-    let result_json = run_plugin(
-        app_handle,
-        "exporter-curl",
-        "pluginHookExport",
-        &[JsValue::from_json(&request_json, &mut context).map_err(|e| e.to_string())?],
-    );
+pub fn run_plugin_export_curl(request: &HttpRequest) -> Result<String, String> {
+    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
+    let plugin_index_file = plugin_dir.join("exporter-curl").join("build/index.mjs");
 
-    let resources: String = serde_json::from_value(result_json).map_err(|e| e.to_string())?;
-    Ok(resources)
+    let request_json = serde_json::to_value(request).map_err(|e| e.to_string())?;
+    let result = run_plugin_deno_block(
+        plugin_index_file.to_str().unwrap(),
+        "pluginHookExport",
+        vec![request_json],
+    )
+    .map_err(|e| e.to_string())?;
+
+    let export_str: String = serde_json::from_value(result).map_err(|e| e.to_string())?;
+    Ok(export_str)
 }
 
 pub async fn run_plugin_import(
-    app_handle: &AppHandle,
     plugin_name: &str,
     file_contents: &str,
 ) -> Result<Option<ImportResult>, String> {
-    let result_json = run_plugin(
-        app_handle,
-        plugin_name,
-        "pluginHookImport",
-        &[js_string!(file_contents).into()],
-    );
+    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
+    let plugin_index_file = plugin_dir.join(plugin_name).join("build/index.mjs");
 
-    if result_json.is_null() {
+    let result = run_plugin_deno_block(
+        plugin_index_file.to_str().unwrap(),
+        "pluginHookImport",
+        vec![serde_json::to_value(file_contents).map_err(|e| e.to_string())?],
+    )
+    .map_err(|e| e.to_string())?;
+
+    if result.is_null() {
         return Ok(None);
     }
 
-    let resources: ImportResult = serde_json::from_value(result_json).map_err(|e| e.to_string())?;
+    let resources: ImportResult = serde_json::from_value(result).map_err(|e| e.to_string())?;
     Ok(Some(resources))
 }
-
-fn run_plugin(
-    app_handle: &AppHandle,
-    plugin_name: &str,
-    entrypoint: &str,
-    js_args: &[JsValue],
-) -> serde_json::Value {
-    let plugin_dir = app_handle
-        .path()
-        .resolve("plugins", BaseDirectory::Resource)
-        .expect("failed to resolve plugin directory resource")
-        .join(plugin_name);
-    let plugin_index_file = plugin_dir.join("index.mjs");
-
-    debug!(
-        "Running plugin dir={:?} file={:?}",
-        plugin_dir, plugin_index_file
-    );
-
-    let loader = Rc::new(SimpleModuleLoader::new(plugin_dir).unwrap());
-    let context = &mut Context::builder()
-        .module_loader(loader.clone())
-        .build()
-        .expect("failed to create context");
-
-    add_runtime(context);
-
-    let source = Source::from_filepath(&plugin_index_file).expect("Error opening file");
-
-    // Can also pass a `Some(realm)` if you need to execute the module in another realm.
-    let module = Module::parse(source, None, context).expect("failed to parse module");
-
-    // Insert parsed entrypoint into the module loader
-    loader.insert(plugin_index_file, module.clone());
-
-    let promise_result = module.load_link_evaluate(context);
-
-    // Very important to push forward the job queue after queueing promises.
-    context.run_jobs();
-
-    // Checking if the final promise didn't return an error.
-    match promise_result.state() {
-        PromiseState::Pending => {
-            panic!("Promise was pending");
-        }
-        PromiseState::Fulfilled(v) => {
-            assert_eq!(v, JsValue::undefined())
-        }
-        PromiseState::Rejected(err) => {
-            panic!("Failed to link: {}", err.display());
-        }
-    }
-
-    let namespace = module.namespace(context);
-
-    let result = namespace
-        .get(js_string!(entrypoint), context)
-        .expect("failed to get entrypoint")
-        .as_callable()
-        .cloned()
-        .ok_or_else(|| JsNativeError::typ().with_message("export wasn't a function!"))
-        .expect("Failed to get entrypoint")
-        .call(&JsValue::undefined(), js_args, context)
-        .expect("Failed to call entrypoint");
-
-    match result.is_undefined() {
-        true => json!(null), // to_json doesn't work with undefined (yet)
-        false => result
-            .to_json(context)
-            .expect("failed to convert result to json"),
-    }
-}
-
-fn add_runtime(context: &mut Context) {
-    let console = Console::init(context);
-    context
-        .register_global_property(js_string!(Console::NAME), console, Attribute::all())
-        .expect("the console builtin shouldn't exist");
-}