Products/FastWave2.0
Archived
2
0
Fork 0
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

component_manager, strict_eval.js

Browse source
This commit is contained in:
Martin Kavík 2024-06-25 18:29:33 +02:00
parent ae4c76ed41
commit 3778469de9
11 changed files with 119 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/header_panel.rs
View file

@ -241,8 +241,10 @@ impl HeaderPanel {
if raw_event.shift_key() {
// @TODO move `prevent_default` to MZ API (next to the `pass_to_parent` method?)
raw_event.prevent_default();
let result = script_bridge::strict_eval(&script.lock_ref());
command_result.set(Some(result));
Task::start(clone!((script, command_result) async move {
let result = script_bridge::strict_eval(&script.lock_ref()).await;
command_result.set(Some(result));
}));
}
}
})

6
frontend/src/platform.rs
View file

@ -15,6 +15,8 @@ use browser as platform;
type Filename = String;
type JavascriptCode = String;
type AddedDecodersCount = usize;
type DecoderPath = String;
pub async fn show_window() {
platform::show_window().await
@ -58,3 +60,7 @@ pub async fn load_signal_and_get_timeline(
pub async fn unload_signal(signal_ref: wellen::SignalRef) {
platform::unload_signal(signal_ref).await
}
pub async fn add_decoders(decoder_paths: Vec<DecoderPath>) -> AddedDecodersCount {
platform::add_decoders(decoder_paths).await
}

10
frontend/src/platform/browser.rs
View file

@ -1,7 +1,7 @@
use shared::wellen_helpers;
use std::sync::Mutex;
use wellen::simple::Waveform;
use zoon::*;
use zoon::{*, eprintln};
#[derive(Default)]
struct BrowserPlatformStore {
@ -120,3 +120,11 @@ pub(super) async fn unload_signal(signal_ref: wellen::SignalRef) {
let waveform = waveform_lock.as_mut().unwrap_throw();
waveform.unload_signals(&[signal_ref]);
}
pub(super) async fn add_decoders(
_decoder_paths: Vec<super::DecoderPath>,
) -> super::AddedDecodersCount {
// @TODO error message for user
eprintln!("Adding decoders is not supported in the browser.");
0
}

12
frontend/src/platform/tauri.rs
View file

@ -56,6 +56,13 @@ pub(super) async fn unload_signal(signal_ref: wellen::SignalRef) {
.unwrap_throw()
}
pub(super) async fn add_decoders(
decoder_paths: Vec<super::DecoderPath>,
) -> super::AddedDecodersCount {
serde_wasm_bindgen::from_value(tauri_glue::add_decoders(decoder_paths).await.unwrap_throw())
.unwrap_throw()
}
mod tauri_glue {
use zoon::*;
@ -86,5 +93,10 @@ mod tauri_glue {
#[wasm_bindgen(catch)]
pub async fn unload_signal(signal_ref_index: usize) -> Result<(), JsValue>;
#[wasm_bindgen(catch)]
pub async fn add_decoders(
decoder_paths: Vec<super::super::DecoderPath>,
) -> Result<JsValue, JsValue>;
}
}

16
frontend/src/script_bridge.rs
View file

@ -1,16 +1,15 @@
use crate::STORE;
use crate::{platform, STORE};
use wellen::GetItem;
use zoon::*;
type FullVarName = String;
type AddedDecodersCount = usize;
type DecoderPath = String;
#[wasm_bindgen(
inline_js = r#"export function strict_eval(code) { "use strict"; return eval?.(`${code}`) }"#
)]
#[wasm_bindgen(module = "/typescript/bundles/strict_eval.js")]
extern "C" {
#[wasm_bindgen(catch)]
pub fn strict_eval(code: &str) -> Result<JsValue, JsValue>;
pub async fn strict_eval(code: &str) -> Result<JsValue, JsValue>;
}
#[wasm_bindgen]
@ -70,8 +69,7 @@ impl FW {
}
/// JS: `FW.add_decoders(["test_files/components/rust_decoder/rust_decoder.wasm"])` -> `1`
pub fn add_decoders(decoder_paths: Vec<DecoderPath>) -> usize {
zoon::println!("decoders: {decoder_paths:#?}");
0
}
pub async fn add_decoders(decoder_paths: Vec<DecoderPath>) -> AddedDecodersCount {
platform::add_decoders(decoder_paths).await
}
}

4
frontend/src/waveform_panel.rs
View file

@ -96,7 +96,7 @@ impl WaveformPanel {
if let Some(javascript_code) =
platform::load_file_with_selected_vars(None).await
{
match script_bridge::strict_eval(&javascript_code) {
match script_bridge::strict_eval(&javascript_code).await {
Ok(js_value) => {
zoon::println!("File with selected vars loaded: {js_value:?}")
}
@ -153,7 +153,7 @@ impl WaveformPanel {
if let Some(javascript_code) =
platform::load_file_with_selected_vars(Some(file)).await
{
match script_bridge::strict_eval(&javascript_code) {
match script_bridge::strict_eval(&javascript_code).await {
Ok(js_value) => zoon::println!(
"File with selected vars loaded: {js_value:?}"
),

5
frontend/typescript/bundles/strict_eval.js Normal file
View file

@ -0,0 +1,5 @@
"use strict";
export async function strict_eval(code) {
return await eval(code)
}

4
frontend/typescript/bundles/tauri_glue.js
View file

@ -2536,7 +2536,11 @@ async function load_signal_and_get_timeline(signal_ref_index, timeline_zoom, tim
async function unload_signal(signal_ref_index) {
return await invoke2("unload_signal", { signal_ref_index });
}
async function add_decoders(decoder_paths) {
return await invoke2("add_decoders", { decoder_paths });
}
export {
add_decoders,
get_hierarchy,
load_file_with_selected_vars,
load_signal_and_get_timeline,

6
frontend/typescript/tauri_glue/tauri_glue.ts
View file

@ -9,6 +9,8 @@ type JavascriptCode = string;
type WellenHierarchy = unknown;
type Timeline = unknown;
type VarFormat = unknown;
type AddedDecodersCount = number;
type DecoderPath = string;
export async function show_window(): Promise<void> {
return await invoke("show_window");
@ -47,3 +49,7 @@ export async function load_signal_and_get_timeline(
export async function unload_signal(signal_ref_index: number): Promise<void> {
return await invoke("unload_signal", { signal_ref_index });
}
export async function add_decoders(decoder_paths: Array<DecoderPath>): Promise<AddedDecodersCount> {
return await invoke("add_decoders", { decoder_paths });
}