mirror of
https://github.com/Noratrieb/viewstrap.git
synced 2026-01-15 00:55:07 +01:00
implement more
This commit is contained in:
parent
c5c87feef2
commit
7afcfa727b
3 changed files with 142 additions and 30 deletions
|
|
@ -3,6 +3,7 @@ use std::{path::Path, pin::Pin, process::Stdio};
|
|||
use axum::extract::ws::{self, WebSocket};
|
||||
use color_eyre::{eyre::Context, Result};
|
||||
use futures::{stream::SplitSink, SinkExt};
|
||||
use serde::Serialize;
|
||||
use tokio::{
|
||||
io::{AsyncRead, AsyncReadExt},
|
||||
process::{Child, Command},
|
||||
|
|
@ -36,6 +37,29 @@ pub async fn build_a_compiler(
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
pub enum Compiler {
|
||||
Bootstrap,
|
||||
Dev,
|
||||
Dist,
|
||||
}
|
||||
|
||||
pub async fn list_compilers(entrypoint: &Path) -> Vec<Compiler> {
|
||||
let mut compilers = vec![Compiler::Bootstrap];
|
||||
|
||||
let build = entrypoint.parent().unwrap().join("build/host");
|
||||
|
||||
if let Ok(true) = tokio::fs::try_exists(build.join("stage1").join("bin").join("rustc")).await {
|
||||
compilers.push(Compiler::Dev);
|
||||
}
|
||||
|
||||
if let Ok(true) = tokio::fs::try_exists(build.join("stage2").join("bin").join("rustc")).await {
|
||||
compilers.push(Compiler::Dist);
|
||||
}
|
||||
|
||||
compilers
|
||||
}
|
||||
|
||||
async fn handle_stdouts(
|
||||
mut stdout: Pin<Box<impl AsyncRead>>,
|
||||
mut stderr: Pin<Box<impl AsyncRead>>,
|
||||
|
|
|
|||
47
src/main.rs
47
src/main.rs
|
|
@ -5,15 +5,16 @@ use std::{net::SocketAddr, path::PathBuf};
|
|||
|
||||
use axum::{
|
||||
extract::{
|
||||
ws::{Message, WebSocket},
|
||||
ws::{CloseFrame, Message, WebSocket},
|
||||
ConnectInfo, TypedHeader, WebSocketUpgrade,
|
||||
},
|
||||
response::IntoResponse,
|
||||
routing::get,
|
||||
Router,
|
||||
};
|
||||
use futures::stream::StreamExt;
|
||||
use serde::Serialize;
|
||||
use bootstrap::Compiler;
|
||||
use futures::{stream::StreamExt, SinkExt};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tower_http::{
|
||||
services::ServeDir,
|
||||
trace::{DefaultMakeSpan, TraceLayer},
|
||||
|
|
@ -94,6 +95,13 @@ async fn ws_handler(
|
|||
enum ServerMessage<'a> {
|
||||
Stdout(&'a str),
|
||||
Stderr(&'a str),
|
||||
AvailableCompilers(Vec<Compiler>),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
enum ClientMessage {
|
||||
Compile,
|
||||
ListCompilers,
|
||||
}
|
||||
|
||||
impl<'a> From<ServerMessage<'a>> for Message {
|
||||
|
|
@ -136,10 +144,35 @@ async fn handle_socket(mut socket: WebSocket, who: SocketAddr, entrypoint: PathB
|
|||
while let Some(Ok(msg)) = receiver.next().await {
|
||||
info!(?msg);
|
||||
|
||||
if let Message::Text(msg) = msg {
|
||||
if msg == "bootstrap me" {
|
||||
if let Err(err) = bootstrap::build_a_compiler(&mut sender, &entrypoint).await {
|
||||
error!(%err);
|
||||
if let Message::Text(msg_str) = msg {
|
||||
let msg = serde_json::from_str::<ClientMessage>(&msg_str);
|
||||
|
||||
match msg {
|
||||
Ok(ClientMessage::Compile) => {
|
||||
if let Err(err) = bootstrap::build_a_compiler(&mut sender, &entrypoint).await {
|
||||
error!(%err);
|
||||
}
|
||||
}
|
||||
Ok(ClientMessage::ListCompilers) => {
|
||||
let compilers = bootstrap::list_compilers(&entrypoint).await;
|
||||
if let Err(err) = sender
|
||||
.send(ServerMessage::AvailableCompilers(compilers).into())
|
||||
.await
|
||||
{
|
||||
error!(%err);
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
error!(?err, ?msg_str, "invalid client message");
|
||||
if let Err(err) = sender
|
||||
.send(Message::Close(Some(CloseFrame {
|
||||
code: 0,
|
||||
reason: "invalid message, you naughty".into(),
|
||||
})))
|
||||
.await
|
||||
{
|
||||
error!(%err);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue