mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 18:31:52 +00:00
* wip: static-server errors * wip: fix wifi * wip: Fix the service_effects * wip: Fix cors in the middleware * wip(chore): Auth clean up the lint. * wip(fix): Vhost * wip: continue manager refactor Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: service manager refactor * wip: Some fixes * wip(fix): Fix the lib.rs * wip * wip(fix): Logs * wip: bins * wip(innspect): Add in the inspect * wip: config * wip(fix): Diagnostic * wip(fix): Dependencies * wip: context * wip(fix) Sorta auth * wip: warnings * wip(fix): registry/admin * wip(fix) marketplace * wip(fix) Some more converted and fixed with the linter and config * wip: Working on the static server * wip(fix)static server * wip: Remove some asynnc * wip: Something about the request and regular rpc * wip: gut install Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: Convert the static server into the new system * wip delete file * test * wip(fix) vhost does not need the with safe defaults * wip: Adding in the wifi * wip: Fix the developer and the verify * wip: new install flow Co-authored-by: J H <Blu-J@users.noreply.github.com> * fix middleware * wip * wip: Fix the auth * wip * continue service refactor * feature: Service get_config * feat: Action * wip: Fighting the great fight against the borrow checker * wip: Remove an error in a file that I just need to deel with later * chore: Add in some more lifetime stuff to the services * wip: Install fix on lifetime * cleanup * wip: Deal with the borrow later * more cleanup * resolve borrowchecker errors * wip(feat): add in the handler for the socket, for now * wip(feat): Update the service_effect_handler::action * chore: Add in the changes to make sure the from_service goes to context * chore: Change the * refactor service map * fix references to service map * fill out restore * wip: Before I work on the store stuff * fix backup module * handle some warnings * feat: add in the ui components on the rust side * feature: Update the procedures * chore: Update the js side of the main and a few of the others * chore: Update the rpc listener to match the persistant container * wip: Working on updating some things to have a better name * wip(feat): Try and get the rpc to return the correct shape? * lxc wip * wip(feat): Try and get the rpc to return the correct shape? * build for container runtime wip * remove container-init * fix build * fix error * chore: Update to work I suppose * lxc wip * remove docker module and feature * download alpine squashfs automatically * overlays effect Co-authored-by: Jade <Blu-J@users.noreply.github.com> * chore: Add the overlay effect * feat: Add the mounter in the main * chore: Convert to use the mounts, still need to work with the sandbox * install fixes * fix ssl * fixes from testing * implement tmpfile for upload * wip * misc fixes * cleanup * cleanup * better progress reporting * progress for sideload * return real guid * add devmode script * fix lxc rootfs path * fix percentage bar * fix progress bar styling * fix build for unstable * tweaks * label progress * tweaks * update progress more often * make symlink in rpc_client * make socket dir * fix parent path * add start-cli to container * add echo and gitInfo commands * wip: Add the init + errors * chore: Add in the exit effect for the system * chore: Change the type to null for failure to parse * move sigterm timeout to stopping status * update order * chore: Update the return type * remove dbg * change the map error * chore: Update the thing to capture id * chore add some life changes * chore: Update the loging * chore: Update the package to run module * us From for RpcError * chore: Update to use import instead * chore: update * chore: Use require for the backup * fix a default * update the type that is wrong * chore: Update the type of the manifest * chore: Update to make null * only symlink if not exists * get rid of double result * better debug info for ErrorCollection * chore: Update effects * chore: fix * mount assets and volumes * add exec instead of spawn * fix mounting in image * fix overlay mounts Co-authored-by: Jade <Blu-J@users.noreply.github.com> * misc fixes * feat: Fix two * fix: systemForEmbassy main * chore: Fix small part of main loop * chore: Modify the bundle * merge * fixMain loop" * move tsc to makefile * chore: Update the return types of the health check * fix client * chore: Convert the todo to use tsmatches * add in the fixes for the seen and create the hack to allow demo * chore: Update to include the systemForStartOs * chore UPdate to the latest types from the expected outout * fixes * fix typo * Don't emit if failure on tsc * wip Co-authored-by: Jade <Blu-J@users.noreply.github.com> * add s9pk api * add inspection * add inspect manifest * newline after display serializable * fix squashfs in image name * edit manifest Co-authored-by: Jade <Blu-J@users.noreply.github.com> * wait for response on repl * ignore sig for now * ignore sig for now * re-enable sig verification * fix * wip * env and chroot * add profiling logs * set uid & gid in squashfs to 100000 * set uid of sqfs to 100000 * fix mksquashfs args * add env to compat * fix * re-add docker feature flag * fix docker output format being stupid * here be dragons * chore: Add in the cross compiling for something * fix npm link * extract logs from container on exit * chore: Update for testing * add log capture to drop trait * chore: add in the modifications that I make * chore: Update small things for no updates * chore: Update the types of something * chore: Make main not complain * idmapped mounts * idmapped volumes * re-enable kiosk * chore: Add in some logging for the new system * bring in start-sdk * remove avahi * chore: Update the deps * switch to musl * chore: Update the version of prettier * chore: Organize' * chore: Update some of the headers back to the standard of fetch * fix musl build * fix idmapped mounts * fix cross build * use cross compiler for correct arch * feat: Add in the faked ssl stuff for the effects * @dr_bonez Did a solution here * chore: Something that DrBonez * chore: up * wip: We have a working server!!! * wip * uninstall * wip * tes --------- Co-authored-by: J H <dragondef@gmail.com> Co-authored-by: J H <Blu-J@users.noreply.github.com> Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
261 lines
7.2 KiB
Rust
261 lines
7.2 KiB
Rust
use std::future::Future;
|
|
use std::ops::{Deref, DerefMut};
|
|
use std::path::{Path, PathBuf};
|
|
use std::time::Duration;
|
|
|
|
use color_eyre::eyre::{eyre, Context, Error};
|
|
use futures::future::BoxFuture;
|
|
use futures::FutureExt;
|
|
use tokio::fs::File;
|
|
use tokio::sync::oneshot;
|
|
use tokio::task::{JoinError, JoinHandle, LocalSet};
|
|
|
|
mod byte_replacement_reader;
|
|
mod rsync;
|
|
mod script_dir;
|
|
pub use byte_replacement_reader::*;
|
|
pub use rsync::*;
|
|
pub use script_dir::*;
|
|
|
|
pub fn const_true() -> bool {
|
|
true
|
|
}
|
|
|
|
pub fn to_tmp_path(path: impl AsRef<Path>) -> Result<PathBuf, Error> {
|
|
let path = path.as_ref();
|
|
if let (Some(parent), Some(file_name)) =
|
|
(path.parent(), path.file_name().and_then(|f| f.to_str()))
|
|
{
|
|
Ok(parent.join(format!(".{}.tmp", file_name)))
|
|
} else {
|
|
Err(eyre!("invalid path: {}", path.display()))
|
|
}
|
|
}
|
|
|
|
pub async fn canonicalize(
|
|
path: impl AsRef<Path> + Send + Sync,
|
|
create_parent: bool,
|
|
) -> Result<PathBuf, Error> {
|
|
fn create_canonical_folder<'a>(
|
|
path: impl AsRef<Path> + Send + Sync + 'a,
|
|
) -> BoxFuture<'a, Result<PathBuf, Error>> {
|
|
async move {
|
|
let path = canonicalize(path, true).await?;
|
|
tokio::fs::create_dir(&path)
|
|
.await
|
|
.with_context(|| path.display().to_string())?;
|
|
Ok(path)
|
|
}
|
|
.boxed()
|
|
}
|
|
let path = path.as_ref();
|
|
if tokio::fs::metadata(path).await.is_err() {
|
|
if let (Some(parent), Some(file_name)) = (path.parent(), path.file_name()) {
|
|
if create_parent && tokio::fs::metadata(parent).await.is_err() {
|
|
return Ok(create_canonical_folder(parent).await?.join(file_name));
|
|
} else {
|
|
return Ok(tokio::fs::canonicalize(parent)
|
|
.await
|
|
.with_context(|| parent.display().to_string())?
|
|
.join(file_name));
|
|
}
|
|
}
|
|
}
|
|
tokio::fs::canonicalize(&path)
|
|
.await
|
|
.with_context(|| path.display().to_string())
|
|
}
|
|
|
|
#[pin_project::pin_project(PinnedDrop)]
|
|
pub struct NonDetachingJoinHandle<T>(#[pin] JoinHandle<T>);
|
|
impl<T> NonDetachingJoinHandle<T> {
|
|
pub async fn wait_for_abort(self) -> Result<T, JoinError> {
|
|
self.abort();
|
|
self.await
|
|
}
|
|
}
|
|
impl<T> From<JoinHandle<T>> for NonDetachingJoinHandle<T> {
|
|
fn from(t: JoinHandle<T>) -> Self {
|
|
NonDetachingJoinHandle(t)
|
|
}
|
|
}
|
|
|
|
impl<T> Deref for NonDetachingJoinHandle<T> {
|
|
type Target = JoinHandle<T>;
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
impl<T> DerefMut for NonDetachingJoinHandle<T> {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.0
|
|
}
|
|
}
|
|
#[pin_project::pinned_drop]
|
|
impl<T> PinnedDrop for NonDetachingJoinHandle<T> {
|
|
fn drop(self: std::pin::Pin<&mut Self>) {
|
|
let this = self.project();
|
|
this.0.into_ref().get_ref().abort()
|
|
}
|
|
}
|
|
impl<T> Future for NonDetachingJoinHandle<T> {
|
|
type Output = Result<T, JoinError>;
|
|
fn poll(
|
|
self: std::pin::Pin<&mut Self>,
|
|
cx: &mut std::task::Context<'_>,
|
|
) -> std::task::Poll<Self::Output> {
|
|
let this = self.project();
|
|
this.0.poll(cx)
|
|
}
|
|
}
|
|
|
|
pub struct AtomicFile {
|
|
tmp_path: PathBuf,
|
|
path: PathBuf,
|
|
file: Option<File>,
|
|
}
|
|
impl AtomicFile {
|
|
pub async fn new(
|
|
path: impl AsRef<Path> + Send + Sync,
|
|
tmp_path: Option<impl AsRef<Path> + Send + Sync>,
|
|
) -> Result<Self, Error> {
|
|
let path = canonicalize(&path, true).await?;
|
|
let tmp_path = if let Some(tmp_path) = tmp_path {
|
|
canonicalize(&tmp_path, true).await?
|
|
} else {
|
|
to_tmp_path(&path)?
|
|
};
|
|
let file = File::create(&tmp_path)
|
|
.await
|
|
.with_context(|| tmp_path.display().to_string())?;
|
|
Ok(Self {
|
|
tmp_path,
|
|
path,
|
|
file: Some(file),
|
|
})
|
|
}
|
|
|
|
pub async fn rollback(mut self) -> Result<(), Error> {
|
|
drop(self.file.take());
|
|
tokio::fs::remove_file(&self.tmp_path)
|
|
.await
|
|
.with_context(|| format!("rm {}", self.tmp_path.display()))?;
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn save(mut self) -> Result<(), Error> {
|
|
use tokio::io::AsyncWriteExt;
|
|
if let Some(file) = self.file.as_mut() {
|
|
file.flush().await?;
|
|
file.shutdown().await?;
|
|
file.sync_all().await?;
|
|
}
|
|
drop(self.file.take());
|
|
tokio::fs::rename(&self.tmp_path, &self.path)
|
|
.await
|
|
.with_context(|| {
|
|
format!("mv {} -> {}", self.tmp_path.display(), self.path.display())
|
|
})?;
|
|
Ok(())
|
|
}
|
|
}
|
|
impl std::ops::Deref for AtomicFile {
|
|
type Target = File;
|
|
fn deref(&self) -> &Self::Target {
|
|
self.file.as_ref().unwrap()
|
|
}
|
|
}
|
|
impl std::ops::DerefMut for AtomicFile {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
self.file.as_mut().unwrap()
|
|
}
|
|
}
|
|
impl Drop for AtomicFile {
|
|
fn drop(&mut self) {
|
|
if let Some(file) = self.file.take() {
|
|
drop(file);
|
|
let path = std::mem::take(&mut self.tmp_path);
|
|
tokio::spawn(async move { tokio::fs::remove_file(path).await.unwrap() });
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct TimedResource<T: 'static + Send> {
|
|
handle: NonDetachingJoinHandle<Option<T>>,
|
|
ready: oneshot::Sender<()>,
|
|
}
|
|
impl<T: 'static + Send> TimedResource<T> {
|
|
pub fn new(resource: T, timer: Duration) -> Self {
|
|
let (send, recv) = oneshot::channel();
|
|
let handle = tokio::spawn(async move {
|
|
tokio::select! {
|
|
_ = tokio::time::sleep(timer) => {
|
|
drop(resource);
|
|
None
|
|
},
|
|
_ = recv => Some(resource),
|
|
}
|
|
});
|
|
Self {
|
|
handle: handle.into(),
|
|
ready: send,
|
|
}
|
|
}
|
|
|
|
pub fn new_with_destructor<
|
|
Fn: FnOnce(T) -> Fut + Send + 'static,
|
|
Fut: Future<Output = ()> + Send,
|
|
>(
|
|
resource: T,
|
|
timer: Duration,
|
|
destructor: Fn,
|
|
) -> Self {
|
|
let (send, recv) = oneshot::channel();
|
|
let handle = tokio::spawn(async move {
|
|
tokio::select! {
|
|
_ = tokio::time::sleep(timer) => {
|
|
destructor(resource).await;
|
|
None
|
|
},
|
|
_ = recv => Some(resource),
|
|
}
|
|
});
|
|
Self {
|
|
handle: handle.into(),
|
|
ready: send,
|
|
}
|
|
}
|
|
|
|
pub async fn get(self) -> Option<T> {
|
|
let _ = self.ready.send(());
|
|
self.handle.await.unwrap()
|
|
}
|
|
|
|
pub fn is_timed_out(&self) -> bool {
|
|
self.ready.is_closed()
|
|
}
|
|
}
|
|
|
|
pub async fn spawn_local<
|
|
T: 'static + Send,
|
|
F: FnOnce() -> Fut + Send + 'static,
|
|
Fut: Future<Output = T> + 'static,
|
|
>(
|
|
fut: F,
|
|
) -> NonDetachingJoinHandle<T> {
|
|
let (send, recv) = tokio::sync::oneshot::channel();
|
|
std::thread::spawn(move || {
|
|
tokio::runtime::Builder::new_current_thread()
|
|
.enable_all()
|
|
.build()
|
|
.unwrap()
|
|
.block_on(async move {
|
|
let set = LocalSet::new();
|
|
send.send(set.spawn_local(fut()).into())
|
|
.unwrap_or_else(|_| unreachable!());
|
|
set.await
|
|
})
|
|
});
|
|
recv.await.unwrap()
|
|
}
|