mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 02:11:53 +00:00
* 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>
140 lines
3.9 KiB
Rust
140 lines
3.9 KiB
Rust
use std::str::FromStr;
|
|
|
|
use clap::builder::ValueParserFactory;
|
|
use models::{FromStrParser, HostId};
|
|
use serde::{Deserialize, Serialize};
|
|
use ts_rs::TS;
|
|
|
|
use crate::net::forward::AvailablePorts;
|
|
use crate::net::vhost::AlpnInfo;
|
|
use crate::prelude::*;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, TS)]
|
|
#[ts(export)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct BindId {
|
|
pub id: HostId,
|
|
pub internal_port: u16,
|
|
}
|
|
impl ValueParserFactory for BindId {
|
|
type Parser = FromStrParser<Self>;
|
|
fn value_parser() -> Self::Parser {
|
|
FromStrParser::new()
|
|
}
|
|
}
|
|
impl FromStr for BindId {
|
|
type Err = Error;
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
let (id, port) = s
|
|
.split_once(":")
|
|
.ok_or_else(|| Error::new(eyre!("expected <id>:<port>"), ErrorKind::ParseUrl))?;
|
|
Ok(Self {
|
|
id: id.parse()?,
|
|
internal_port: port.parse()?,
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, Serialize, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[ts(export)]
|
|
pub struct BindInfo {
|
|
pub enabled: bool,
|
|
pub options: BindOptions,
|
|
pub lan: LanInfo,
|
|
}
|
|
#[derive(Clone, Copy, Debug, Deserialize, Serialize, TS, PartialEq, Eq, PartialOrd, Ord)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[ts(export)]
|
|
pub struct LanInfo {
|
|
pub assigned_port: Option<u16>,
|
|
pub assigned_ssl_port: Option<u16>,
|
|
}
|
|
impl BindInfo {
|
|
pub fn new(available_ports: &mut AvailablePorts, options: BindOptions) -> Result<Self, Error> {
|
|
let mut assigned_port = None;
|
|
let mut assigned_ssl_port = None;
|
|
if options.secure.is_some() {
|
|
assigned_port = Some(available_ports.alloc()?);
|
|
}
|
|
if options.add_ssl.is_some() {
|
|
assigned_ssl_port = Some(available_ports.alloc()?);
|
|
}
|
|
Ok(Self {
|
|
enabled: true,
|
|
options,
|
|
lan: LanInfo {
|
|
assigned_port,
|
|
assigned_ssl_port,
|
|
},
|
|
})
|
|
}
|
|
pub fn update(
|
|
self,
|
|
available_ports: &mut AvailablePorts,
|
|
options: BindOptions,
|
|
) -> Result<Self, Error> {
|
|
let Self { mut lan, .. } = self;
|
|
if options
|
|
.secure
|
|
.map_or(false, |s| !(s.ssl && options.add_ssl.is_some()))
|
|
// doesn't make sense to have 2 listening ports, both with ssl
|
|
{
|
|
lan.assigned_port = if let Some(port) = lan.assigned_port.take() {
|
|
Some(port)
|
|
} else {
|
|
Some(available_ports.alloc()?)
|
|
};
|
|
} else {
|
|
if let Some(port) = lan.assigned_port.take() {
|
|
available_ports.free([port]);
|
|
}
|
|
}
|
|
if options.add_ssl.is_some() {
|
|
lan.assigned_ssl_port = if let Some(port) = lan.assigned_ssl_port.take() {
|
|
Some(port)
|
|
} else {
|
|
Some(available_ports.alloc()?)
|
|
};
|
|
} else {
|
|
if let Some(port) = lan.assigned_ssl_port.take() {
|
|
available_ports.free([port]);
|
|
}
|
|
}
|
|
Ok(Self {
|
|
enabled: true,
|
|
options,
|
|
lan,
|
|
})
|
|
}
|
|
pub fn disable(&mut self) {
|
|
self.enabled = false;
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, TS)]
|
|
#[ts(export)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Security {
|
|
pub ssl: bool,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[ts(export)]
|
|
pub struct BindOptions {
|
|
pub preferred_external_port: u16,
|
|
pub add_ssl: Option<AddSslOptions>,
|
|
pub secure: Option<Security>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[ts(export)]
|
|
pub struct AddSslOptions {
|
|
pub preferred_external_port: u16,
|
|
// #[serde(default)]
|
|
// pub add_x_forwarded_headers: bool, // TODO
|
|
pub alpn: Option<AlpnInfo>,
|
|
}
|