Working input response!

src/main.rs

@@ -16,6 +16,7 @@ mod utils;
 mod wasm_vm;
 
 use std::cell::RefCell;
+use std::collections::HashMap;
 use std::io::Write;
 use std::os::unix::net::UnixStream;
 use std::path::PathBuf;
@@ -26,10 +27,13 @@ use panes::PaneId;
 use serde::{Deserialize, Serialize};
 use structopt::StructOpt;
 use termion::input::TermRead;
-use wasm_vm::PluginInstruction;
+use wasmer::{ChainableNamedResolver, Instance, Module, Store, Value};
+use wasmer_wasi::{Pipe, WasiState};
 
 use crate::command_is_executing::CommandIsExecuting;
-use crate::errors::{AppContext, ContextType, ErrorContext, PtyContext, ScreenContext};
+use crate::errors::{
+    AppContext, ContextType, ErrorContext, PluginContext, PtyContext, ScreenContext,
+};
 use crate::input::input_loop;
 use crate::layout::Layout;
 use crate::os_input_output::{get_os_input, OsApi};
@@ -39,6 +43,7 @@ use crate::utils::{
     consts::{MOSAIC_IPC_PIPE, MOSAIC_TMP_DIR, MOSAIC_TMP_LOG_DIR},
     logging::*,
 };
+use crate::wasm_vm::{mosaic_imports, wasi_stdout, wasi_write_string, PluginInstruction};
 
 thread_local!(static OPENCALLS: RefCell<ErrorContext> = RefCell::default());
 
@@ -403,13 +408,10 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: Opt) {
     active_threads.push(
         thread::Builder::new()
             .name("wasm".to_string())
-            .spawn(move || {
-                use crate::errors::PluginContext;
-                use crate::wasm_vm::{mosaic_imports, wasi_stdout};
-                use std::collections::HashMap;
-                use wasmer::{ChainableNamedResolver, Instance, Module, Store, Value};
-                use wasmer_wasi::{Pipe, WasiState};
+            .spawn({
+                let mut send_screen_instructions = send_screen_instructions.clone();
 
+                move || {
                     let store = Store::default();
 
                     let mut plugin_id = 0;
@@ -420,6 +422,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: Opt) {
                             .recv()
                             .expect("failed to receive event on channel");
                         err_ctx.add_call(ContextType::Plugin(PluginContext::from(&event)));
+                        send_screen_instructions.update(err_ctx);
                         match event {
                             PluginInstruction::Load(pid_tx, path) => {
                                 // FIXME: Cache this compiled module on disk. I could use `(de)serialize_to_file()` for that
@@ -469,15 +472,19 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: Opt) {
                                 let handle_key = instance.exports.get_function("handle_key").unwrap();
                                 for key in input_bytes.keys() {
                                     if let Ok(key) = key {
-                                    dbg!(serde_json::to_string(&key));
+                                        wasi_write_string(wasi_env, &serde_json::to_string(&key).unwrap());
+                                        handle_key.call(&[]).unwrap();
                                     }
                                 }
+
+                                send_screen_instructions.send(ScreenInstruction::Render).unwrap();
                             }
                             PluginInstruction::Quit => break,
                             i => panic!("Yo, dawg, nice job calling the wasm thread!\n {:?} is defo not implemented yet...", i),
                         }
                     }
                 }
+        }
         ).unwrap(),
     );