mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-04 06:19:44 +00:00
Refactor/actions (#2733)
* store, properties, manifest * interfaces * init and backups * fix init and backups * file models * more versions * dependencies * config except dynamic types * clean up config * remove disabled from non-dynamic vaues * actions * standardize example code block formats * wip: actions refactor Co-authored-by: Jade <Blu-J@users.noreply.github.com> * commit types * fix types * update types * update action request type * update apis * add description to actionrequest * clean up imports * revert package json * chore: Remove the recursive to the index * chore: Remove the other thing I was testing * flatten action requests * update container runtime with new config paradigm * new actions strategy * seems to be working * misc backend fixes * fix fe bugs * only show breakages if breakages * only show success modal if result * don't panic on failed removal * hide config from actions page * polyfill autoconfig * use metadata strategy for actions instead of prev * misc fixes * chore: split the sdk into 2 libs (#2736) * follow sideload progress (#2718) * follow sideload progress * small bugfix * shareReplay with no refcount false * don't wrap sideload progress in RPCResult * dont present toast --------- Co-authored-by: Aiden McClelland <me@drbonez.dev> * chore: Add the initial of the creation of the two sdk * chore: Add in the baseDist * chore: Add in the baseDist * chore: Get the web and the runtime-container running * chore: Remove the empty file * chore: Fix it so the container-runtime works --------- Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com> Co-authored-by: Aiden McClelland <me@drbonez.dev> * misc fixes * update todos * minor clean up * fix link script * update node version in CI test * fix node version syntax in ci build * wip: fixing callbacks * fix sdk makefile dependencies * add support for const outside of main * update apis * don't panic! * Chore: Capture weird case on rpc, and log that * fix procedure id issue * pass input value for dep auto config * handle disabled and warning for actions * chore: Fix for link not having node_modules * sdk fixes * fix build * fix build * fix build --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> Co-authored-by: Jade <Blu-J@users.noreply.github.com> Co-authored-by: J H <dragondef@gmail.com> Co-authored-by: Jade <2364004+Blu-J@users.noreply.github.com> Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com>
This commit is contained in:
@@ -1,36 +0,0 @@
|
||||
use std::marker::PhantomData;
|
||||
use std::str::FromStr;
|
||||
|
||||
use clap::builder::TypedValueParser;
|
||||
|
||||
use crate::prelude::*;
|
||||
|
||||
pub struct FromStrParser<T>(PhantomData<T>);
|
||||
impl<T> FromStrParser<T> {
|
||||
pub fn new() -> Self {
|
||||
Self(PhantomData)
|
||||
}
|
||||
}
|
||||
impl<T> Clone for FromStrParser<T> {
|
||||
fn clone(&self) -> Self {
|
||||
Self(PhantomData)
|
||||
}
|
||||
}
|
||||
impl<T> TypedValueParser for FromStrParser<T>
|
||||
where
|
||||
T: FromStr + Clone + Send + Sync + 'static,
|
||||
T::Err: std::fmt::Display,
|
||||
{
|
||||
type Value = T;
|
||||
fn parse_ref(
|
||||
&self,
|
||||
_: &clap::Command,
|
||||
_: Option<&clap::Arg>,
|
||||
value: &std::ffi::OsStr,
|
||||
) -> Result<Self::Value, clap::Error> {
|
||||
value
|
||||
.to_string_lossy()
|
||||
.parse()
|
||||
.map_err(|e| clap::Error::raw(clap::error::ErrorKind::ValueValidation, e))
|
||||
}
|
||||
}
|
||||
@@ -442,6 +442,13 @@ impl<T> BackTrackingIO<T> {
|
||||
},
|
||||
}
|
||||
}
|
||||
pub fn read_buffer(&self) -> &[u8] {
|
||||
match &self.buffer {
|
||||
BTBuffer::NotBuffering => &[],
|
||||
BTBuffer::Buffering { read, .. } => read,
|
||||
BTBuffer::Rewound { read } => read.remaining_slice(),
|
||||
}
|
||||
}
|
||||
#[must_use]
|
||||
pub fn stop_buffering(&mut self) -> Vec<u8> {
|
||||
match std::mem::take(&mut self.buffer) {
|
||||
@@ -512,6 +519,28 @@ impl<T: AsyncRead> AsyncRead for BackTrackingIO<T> {
|
||||
}
|
||||
}
|
||||
}
|
||||
impl<T: std::io::Read> std::io::Read for BackTrackingIO<T> {
|
||||
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
||||
match &mut self.buffer {
|
||||
BTBuffer::Buffering { read, .. } => {
|
||||
let n = self.io.read(buf)?;
|
||||
read.extend_from_slice(&buf[..n]);
|
||||
Ok(n)
|
||||
}
|
||||
BTBuffer::NotBuffering => self.io.read(buf),
|
||||
BTBuffer::Rewound { read } => {
|
||||
let mut ready = false;
|
||||
if (read.position() as usize) < read.get_ref().len() {
|
||||
let n = std::io::Read::read(read, buf)?;
|
||||
if n != 0 {
|
||||
return Ok(n);
|
||||
}
|
||||
}
|
||||
self.io.read(buf)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: AsyncWrite> AsyncWrite for BackTrackingIO<T> {
|
||||
fn is_write_vectored(&self) -> bool {
|
||||
@@ -869,7 +898,7 @@ impl Drop for TmpDir {
|
||||
if self.path.exists() {
|
||||
let path = std::mem::take(&mut self.path);
|
||||
tokio::spawn(async move {
|
||||
tokio::fs::remove_dir_all(&path).await.unwrap();
|
||||
tokio::fs::remove_dir_all(&path).await.log_err();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@ use crate::util::serde::{deserialize_from_str, serialize_display};
|
||||
use crate::{Error, ErrorKind, ResultExt as _};
|
||||
|
||||
pub mod actor;
|
||||
pub mod clap;
|
||||
pub mod collections;
|
||||
pub mod cpupower;
|
||||
pub mod crypto;
|
||||
@@ -568,7 +567,7 @@ pub struct FileLock(#[allow(unused)] OwnedMutexGuard<()>, Option<FdLock<File>>);
|
||||
impl Drop for FileLock {
|
||||
fn drop(&mut self) {
|
||||
if let Some(fd_lock) = self.1.take() {
|
||||
tokio::task::spawn_blocking(|| fd_lock.unlock(true).map_err(|(_, e)| e).unwrap());
|
||||
tokio::task::spawn_blocking(|| fd_lock.unlock(true).map_err(|(_, e)| e).log_err());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use std::any::Any;
|
||||
use std::collections::VecDeque;
|
||||
use std::marker::PhantomData;
|
||||
use std::ops::Deref;
|
||||
@@ -9,6 +8,7 @@ use clap::builder::ValueParserFactory;
|
||||
use clap::{ArgMatches, CommandFactory, FromArgMatches};
|
||||
use color_eyre::eyre::eyre;
|
||||
use imbl::OrdMap;
|
||||
use models::FromStrParser;
|
||||
use openssl::pkey::{PKey, Private};
|
||||
use openssl::x509::X509;
|
||||
use rpc_toolkit::{
|
||||
@@ -17,12 +17,10 @@ use rpc_toolkit::{
|
||||
use serde::de::DeserializeOwned;
|
||||
use serde::ser::{SerializeMap, SerializeSeq};
|
||||
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
||||
use serde_json::Value;
|
||||
use ts_rs::TS;
|
||||
|
||||
use super::IntoDoubleEndedIterator;
|
||||
use crate::prelude::*;
|
||||
use crate::util::clap::FromStrParser;
|
||||
use crate::util::Apply;
|
||||
|
||||
pub fn deserialize_from_str<
|
||||
@@ -272,7 +270,7 @@ impl std::fmt::Display for IoFormat {
|
||||
impl std::str::FromStr for IoFormat {
|
||||
type Err = Error;
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
serde_json::from_value(Value::String(s.to_owned()))
|
||||
serde_json::from_value(serde_json::Value::String(s.to_owned()))
|
||||
.with_kind(crate::ErrorKind::Deserialization)
|
||||
}
|
||||
}
|
||||
@@ -566,7 +564,7 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Serialize, TS)]
|
||||
#[derive(Deserialize, Serialize, TS, Clone)]
|
||||
pub struct StdinDeserializable<T>(pub T);
|
||||
impl<T> Default for StdinDeserializable<T>
|
||||
where
|
||||
@@ -1358,3 +1356,19 @@ impl Serialize for MaybeUtf8String {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_partial_of(partial: &Value, full: &Value) -> bool {
|
||||
match (partial, full) {
|
||||
(Value::Object(partial), Value::Object(full)) => partial.iter().all(|(k, v)| {
|
||||
if let Some(v_full) = full.get(k) {
|
||||
is_partial_of(v, v_full)
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}),
|
||||
(Value::Array(partial), Value::Array(full)) => partial
|
||||
.iter()
|
||||
.all(|v| full.iter().any(|v_full| is_partial_of(v, v_full))),
|
||||
(_, _) => partial == full,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user