From adda44e861551d866c42272309875f207efd9dae Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Thu, 22 Aug 2024 11:27:55 -0700 Subject: [PATCH] Pass render purpose to render --- package-lock.json | 8 ++++---- package.json | 2 +- plugin-runtime-types/package-lock.json | 4 ++-- plugin-runtime-types/package.json | 2 +- .../src/gen/CallTemplateFunctionPurpose.ts | 2 +- scripts/vendor-plugins.cjs | 12 ++++++------ src-tauri/src/http_request.rs | 5 ++++- src-tauri/src/lib.rs | 3 ++- src-tauri/src/render.rs | 5 ++--- src-tauri/src/template_callback.rs | 13 +++++++++++-- src-tauri/yaak_plugin_runtime/src/events.rs | 4 ++-- src-tauri/yaak_plugin_runtime/src/manager.rs | 3 ++- 12 files changed, 38 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index f614b3ed..2b41a1c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@tauri-apps/plugin-log": "^2.0.0-rc.0", "@tauri-apps/plugin-os": "^2.0.0-rc.0", "@tauri-apps/plugin-shell": "^2.0.0-rc.0", - "@yaakapp/api": "^0.1.10", + "@yaakapp/api": "^0.1.11", "buffer": "^6.0.3", "classnames": "^2.3.2", "cm6-graphql": "^0.0.9", @@ -2990,9 +2990,9 @@ "integrity": "sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==" }, "node_modules/@yaakapp/api": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.1.10.tgz", - "integrity": "sha512-K4iV7Et+5MmE+4Eui0mu/e8Y5vlvfSyykEy6Wl2sBOg6vRqr87N+OyUs/gkct7TU07QM8zew/hbM/OTESVhQWQ==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.1.11.tgz", + "integrity": "sha512-dRZAXrQpftWygy9nJXiIYPzLA9om6reO/RiEacMe9RKqMjNG6FRF8cGmj7BcdyreizJOkH/DmcOpxn09kDD0XA==", "dependencies": { "@types/node": "^22.0.0" } diff --git a/package.json b/package.json index 2ed1ade8..ee747ff2 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@tauri-apps/plugin-log": "^2.0.0-rc.0", "@tauri-apps/plugin-os": "^2.0.0-rc.0", "@tauri-apps/plugin-shell": "^2.0.0-rc.0", - "@yaakapp/api": "^0.1.10", + "@yaakapp/api": "^0.1.11", "buffer": "^6.0.3", "classnames": "^2.3.2", "cm6-graphql": "^0.0.9", diff --git a/plugin-runtime-types/package-lock.json b/plugin-runtime-types/package-lock.json index 0c060be2..a01dbc2e 100644 --- a/plugin-runtime-types/package-lock.json +++ b/plugin-runtime-types/package-lock.json @@ -1,12 +1,12 @@ { "name": "@yaakapp/api", - "version": "0.1.7", + "version": "0.1.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@yaakapp/api", - "version": "0.1.7", + "version": "0.1.11", "dependencies": { "@types/node": "^22.0.0" }, diff --git a/plugin-runtime-types/package.json b/plugin-runtime-types/package.json index 837a1846..42b2e513 100644 --- a/plugin-runtime-types/package.json +++ b/plugin-runtime-types/package.json @@ -1,6 +1,6 @@ { "name": "@yaakapp/api", - "version": "0.1.10", + "version": "0.1.11", "main": "lib/index.js", "typings": "./lib/index.d.ts", "files": [ diff --git a/plugin-runtime-types/src/gen/CallTemplateFunctionPurpose.ts b/plugin-runtime-types/src/gen/CallTemplateFunctionPurpose.ts index 32e47e97..0b5e7689 100644 --- a/plugin-runtime-types/src/gen/CallTemplateFunctionPurpose.ts +++ b/plugin-runtime-types/src/gen/CallTemplateFunctionPurpose.ts @@ -1,3 +1,3 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -export type CallTemplateFunctionPurpose = { "type": "send" } | { "type": "preview" }; +export type CallTemplateFunctionPurpose = "send" | "preview"; diff --git a/scripts/vendor-plugins.cjs b/scripts/vendor-plugins.cjs index c29369cd..fb91b3af 100644 --- a/scripts/vendor-plugins.cjs +++ b/scripts/vendor-plugins.cjs @@ -1,16 +1,16 @@ -const {readdirSync, cpSync} = require("node:fs"); -const path = require("node:path"); -const {execSync} = require("node:child_process"); +const { readdirSync, cpSync } = require('node:fs'); +const path = require('node:path'); +const { execSync } = require('node:child_process'); const pluginsDir = process.env.YAAK_PLUGINS_DIR; if (!pluginsDir) { - console.log("YAAK_PLUGINS_DIR is not set"); + console.log('YAAK_PLUGINS_DIR is not set'); process.exit(1); } console.log('Installing Yaak plugins dependencies', pluginsDir); -execSync('npm ci', {cwd: pluginsDir}); +execSync('npm ci', { cwd: pluginsDir }); console.log('Building Yaak plugins', pluginsDir); -execSync('npm run build', {cwd: pluginsDir}); +execSync('npm run build', { cwd: pluginsDir }); console.log('Copying Yaak plugins to', pluginsDir); diff --git a/src-tauri/src/http_request.rs b/src-tauri/src/http_request.rs index 52e6d6ac..9abcb9c5 100644 --- a/src-tauri/src/http_request.rs +++ b/src-tauri/src/http_request.rs @@ -9,6 +9,7 @@ use std::time::Duration; use crate::render::render_http_request; use crate::response_err; +use crate::template_callback::PluginTemplateCallback; use base64::Engine; use http::header::{ACCEPT, USER_AGENT}; use http::{HeaderMap, HeaderName, HeaderValue}; @@ -37,11 +38,13 @@ pub async fn send_http_request( let workspace = get_workspace(window, &request.workspace_id) .await .expect("Failed to get Workspace"); + let cb = &*window.app_handle().state::(); + let cb = cb.for_send(); let rendered_request = render_http_request( - window.app_handle(), &request, &workspace, environment.as_ref(), + &cb, ) .await; diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 08727ea0..269fd950 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -2006,11 +2006,12 @@ async fn handle_plugin_event( None => None, Some(id) => get_environment(&w, id.as_str()).await.ok(), }; + let cb = &*app_handle.state::(); let rendered_http_request = render_http_request( - app_handle, &req.http_request, &workspace, environment.as_ref(), + cb, ) .await; Some(InternalEventPayload::RenderHttpRequestResponse( diff --git a/src-tauri/src/render.rs b/src-tauri/src/render.rs index 2d25ce3a..7737e639 100644 --- a/src-tauri/src/render.rs +++ b/src-tauri/src/render.rs @@ -52,13 +52,12 @@ pub async fn render_grpc_request( } } -pub async fn render_http_request( - app_handle: &AppHandle, +pub async fn render_http_request( r: &HttpRequest, w: &Workspace, e: Option<&Environment>, + cb: &PluginTemplateCallback, ) -> HttpRequest { - let cb = &*app_handle.state::(); let vars = &variables_from_environment(w, e, cb).await; let mut url_parameters = Vec::new(); diff --git a/src-tauri/src/template_callback.rs b/src-tauri/src/template_callback.rs index f9b174f2..48bdcfec 100644 --- a/src-tauri/src/template_callback.rs +++ b/src-tauri/src/template_callback.rs @@ -1,15 +1,24 @@ use std::collections::HashMap; use tauri::{AppHandle, Manager}; +use yaak_plugin_runtime::events::CallTemplateFunctionPurpose; use yaak_plugin_runtime::manager::PluginManager; use yaak_templates::TemplateCallback; +#[derive(Clone)] pub struct PluginTemplateCallback { app_handle: AppHandle, + purpose: CallTemplateFunctionPurpose, } impl PluginTemplateCallback { pub fn new(app_handle: AppHandle) -> PluginTemplateCallback { - PluginTemplateCallback { app_handle } + PluginTemplateCallback { app_handle, purpose: CallTemplateFunctionPurpose::Preview } + } + + pub fn for_send(&self) -> PluginTemplateCallback { + let mut v = self.clone(); + v.purpose = CallTemplateFunctionPurpose::Send; + v } } @@ -17,7 +26,7 @@ impl TemplateCallback for PluginTemplateCallback { async fn run(&self, fn_name: &str, args: HashMap) -> Result { let plugin_manager = self.app_handle.state::(); let resp = plugin_manager - .call_template_function(fn_name, args) + .call_template_function(fn_name, args, self.purpose.clone()) .await .map_err(|e| e.to_string())?; Ok(resp.unwrap_or_default()) diff --git a/src-tauri/yaak_plugin_runtime/src/events.rs b/src-tauri/yaak_plugin_runtime/src/events.rs index 952d754f..b0892044 100644 --- a/src-tauri/yaak_plugin_runtime/src/events.rs +++ b/src-tauri/yaak_plugin_runtime/src/events.rs @@ -171,7 +171,7 @@ pub struct ShowToastRequest { } #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[serde(rename_all = "camelCase")] +#[serde(rename_all = "snake_case")] #[ts(export)] pub enum ToastVariant { Custom, @@ -294,7 +294,7 @@ pub struct CallTemplateFunctionArgs { } #[derive(Debug, Clone, Serialize, Deserialize, TS)] -#[serde(rename_all = "snake_case", tag = "type")] +#[serde(rename_all = "snake_case")] #[ts(export)] pub enum CallTemplateFunctionPurpose { Send, diff --git a/src-tauri/yaak_plugin_runtime/src/manager.rs b/src-tauri/yaak_plugin_runtime/src/manager.rs index b4ba877c..ad853e80 100644 --- a/src-tauri/yaak_plugin_runtime/src/manager.rs +++ b/src-tauri/yaak_plugin_runtime/src/manager.rs @@ -115,11 +115,12 @@ impl PluginManager { &self, fn_name: &str, args: HashMap, + purpose: CallTemplateFunctionPurpose, ) -> Result> { let req = CallTemplateFunctionRequest { name: fn_name.to_string(), args: CallTemplateFunctionArgs { - purpose: CallTemplateFunctionPurpose::Preview, + purpose, values: args, }, };