1.0.15

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasmo"
-version = "1.0.14"
+version = "1.0.15"
 edition = "2021"
 authors = ["Zwiterrion <[email protected]>"]
 license = "MIT OR Apache-2.0"

cli/src/bin.rs

@@ -457,17 +457,19 @@ async fn build(path: Option<String>, server: Option<String>, host: Host, client_
 
     let plugin = plugin::read_plugin(&complete_path);
 
+    let authorization = format!("Basic {}", 
+        general_purpose::STANDARD_NO_PAD.encode(format!("{}:{}", 
+        configuration.get(WASMO_CLIENT_ID).unwrap_or(&"".to_string()), 
+        configuration.get(WASMO_CLIENT_SECRET).unwrap_or(&"".to_string()))));
+
     let request = Request::builder()
         .method(Method::POST)
         .uri(format!(
             "{}/api/plugins/build",
             configuration.get(WASMO_SERVER).unwrap()
         ))
         .header("Content-Type", "application/json")
-        .header("Authorization",
-         general_purpose::STANDARD_NO_PAD.encode(format!("{}:{}", 
-         configuration.get(WASMO_CLIENT_ID).unwrap_or(&"".to_string()), 
-         configuration.get(WASMO_CLIENT_SECRET).unwrap_or(&"".to_string()))))
+        .header("Authorization", &authorization)
         .body(Body::from(serde_json::to_string(&plugin).unwrap()))
         .unwrap();
 
@@ -480,7 +482,7 @@ async fn build(path: Option<String>, server: Option<String>, host: Host, client_
     match resp {
         Err(e) => panic!("{:#?}", e),
         Ok(k) => {
-            logger::log(format!("Build call status: {}", k.status()));
+            logger::indent_println(format!("Build call status: {}", k.status()));
 
             if k.status() == 403 || k.status() == 401 {
                 return Err(WasmoError::BuildInterrupt("unauthorized".to_string()));
@@ -495,7 +497,9 @@ async fn build(path: Option<String>, server: Option<String>, host: Host, client_
             .unwrap();
 
             let build_result =
-                websocket::ws_listen(&configuration.get(WASMO_SERVER).unwrap(), &result.queue_id)
+                websocket::ws_listen(&configuration.get(WASMO_SERVER).unwrap(), 
+                &result.queue_id,
+                        &authorization)
                     .await;
 
             match build_result {

cli/src/logger.rs

@@ -31,11 +31,6 @@ pub fn check_loading() {
     }
 }
 
-pub fn log(_: String) {
-    // let mut logger = Logger::new();
-    // logger.log(str);
-}
-
 pub fn error(str: String) {
     check_loading();
     let mut logger = Logger::new();

cli/src/websocket.rs

@@ -1,7 +1,7 @@
 use futures_util::StreamExt;
 use std::fmt;
 use tokio::io::AsyncReadExt;
-use tokio_tungstenite::{connect_async, tungstenite::protocol::Message};
+use tokio_tungstenite::{connect_async, tungstenite::{client::IntoClientRequest, protocol::Message}};
 
 #[derive(PartialEq, Clone, Copy, Debug)]
 pub enum BuildResult {
@@ -41,20 +41,27 @@ async fn read_stdin(tx: futures_channel::mpsc::UnboundedSender<Message>) {
     }
 }
 
-pub async fn ws_listen(url: &String, channel: &String) -> BuildResult {
+pub async fn ws_listen(url: &String, channel: &String, authorization: &String) -> BuildResult {
     crate::logger::loading(format!("<yellow>Listening</> websocket from {}", url));
 
     let (stdin_tx, _) = futures_channel::mpsc::unbounded();
     tokio::spawn(read_stdin(stdin_tx));
 
-    let (ws_stream, _) = connect_async(format!(
+    let mut request = format!(
         "{}/{}",
         url.replace("http://", "ws://")
             .replace("https://", "wss://"),
         channel
-    ))
-    .await
-    .expect("Failed to connect");
+    )
+        .into_client_request()
+        .unwrap();
+
+    let headers = request.headers_mut();
+    headers.insert("Authorization", authorization.parse().unwrap());
+
+    let (ws_stream, _) = connect_async(request)
+        .await
+        .expect("Failed to connect");
 
     let (_write, mut read) = ws_stream.split();
 

server/build/67005445-91be-4e69-a107-d6dd14fb89f1/esbuild.js

@@ -0,0 +1,12 @@
+const esbuild = require('esbuild');
+
+esbuild
+    .build({
+        entryPoints: ['index.js'],
+        outdir: 'dist',
+        bundle: true,
+        sourcemap: true,
+        minify: false, // might want to use true for production build
+        format: 'cjs', // needs to be CJS for now
+        target: ['es2020'] // don't go over es2020 because quickjs doesn't support it
+    })

server/build/67005445-91be-4e69-a107-d6dd14fb89f1/index.js

@@ -0,0 +1,6 @@
+function greet() {
+    const name = Host.inputString()
+    Host.outputString(`Hello, ${name}`)
+}
+
+module.exports = { greet }