summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client.rs5
-rw-r--r--src/client/client.rs33
-rw-r--r--src/client/connector.rs40
-rw-r--r--src/client/connector/httpconnector.rs92
-rw-r--r--src/client/executor.rs19
-rw-r--r--src/client/main.rs76
-rw-r--r--src/tasks.rs124
7 files changed, 286 insertions, 103 deletions
diff --git a/src/client.rs b/src/client.rs
index 2377549..d5dbd4f 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -12,5 +12,8 @@ pub struct Client<'a> {
pub username: String,
pub realname: String,
pub langs: Option<Vec<Language>>,
- pub env: Vec<(String, String)>,
+ pub env: Vec<(
+ String,
+ String,
+ )>,
}
diff --git a/src/client/client.rs b/src/client/client.rs
index 9080cf1..780d586 100644
--- a/src/client/client.rs
+++ b/src/client/client.rs
@@ -24,7 +24,28 @@ Username: {}
Real Name: {}
Languages: {:?}
Environment Variables: {:?}"#,
- self.inner.ip, self.inner.hostname, self.inner.device_name, self.inner.os, self.inner.cpu_arch, self.inner.distro, self.inner.desktop_env, self.inner.username, self.inner.realname, self.inner.langs, self.inner.env
+ self.inner
+ .ip,
+ self.inner
+ .hostname,
+ self.inner
+ .device_name,
+ self.inner
+ .os,
+ self.inner
+ .cpu_arch,
+ self.inner
+ .distro,
+ self.inner
+ .desktop_env,
+ self.inner
+ .username,
+ self.inner
+ .realname,
+ self.inner
+ .langs,
+ self.inner
+ .env
)
}
}
@@ -34,7 +55,9 @@ impl<'a, C: Connection> Client<'a, C> {
let c = Self {
inner: remote_control_rs::client::Client {
ip: connector.get_ip(),
- hostname: gethostname().into_string().unwrap_or_default(),
+ hostname: gethostname()
+ .into_string()
+ .unwrap_or_default(),
device_name: whoami::devicename(),
os: std::env::consts::OS,
cpu_arch: std::env::consts::ARCH,
@@ -50,14 +73,16 @@ impl<'a, C: Connection> Client<'a, C> {
},
connector,
};
- c.connector.init(&c)?;
+ c.connector
+ .init(&c)?;
Ok(c)
}
pub fn enter_loop(mut self) -> ! {
loop {
sleep(Duration::from_millis(500));
- self.connector.tick();
+ self.connector
+ .tick();
}
}
}
diff --git a/src/client/connector.rs b/src/client/connector.rs
index d977ace..25f8b5c 100644
--- a/src/client/connector.rs
+++ b/src/client/connector.rs
@@ -27,18 +27,23 @@ pub trait Connection {
fn get_ip(&self) -> Option<IpAddr>;
fn force_network(&mut self) {
- _ = Executor::new(&NETWORK_T, ["true"]);
+ _ = Executor::new(
+ &NETWORK_T,
+ ["true"],
+ );
}
fn init<'a>(&self, c: &Client<'a, Self>) -> std::result::Result<(), Self::Err>
where
Self: std::marker::Sized,
{
- self.ntfy(format!(
- r#"New client:
+ self.ntfy(
+ format!(
+ r#"New client:
{c}
"#,
- ))
+ ),
+ )
}
fn reinit(&mut self) {
@@ -60,17 +65,38 @@ pub trait Connection {
return;
}
- let mut it = s.as_ref().split_whitespace();
+ let mut it = s
+ .as_ref()
+ .split_whitespace();
let task = match it.next() {
Some(t) => t,
None => return,
};
// FIXME: handle the errors... peak prod code
- self.ntfy(Executor::new(task.try_into().unwrap(), it).unwrap().run().unwrap().clone().unwrap()).unwrap();
+ self.ntfy(
+ Executor::new(
+ task.try_into()
+ .unwrap(),
+ it,
+ )
+ .unwrap()
+ .run()
+ .unwrap()
+ .clone()
+ .unwrap(),
+ )
+ .unwrap();
}
Result::Err(e) => {
#[cfg(debug_assertions)]
- std::eprintln!("[{}:{}:{}] {} = {:#?}", std::file!(), std::line!(), std::column!(), std::stringify!(e), &&e as &dyn std::fmt::Debug,);
+ std::eprintln!(
+ "[{}:{}:{}] {} = {:#?}",
+ std::file!(),
+ std::line!(),
+ std::column!(),
+ std::stringify!(e),
+ &&e as &dyn std::fmt::Debug,
+ );
}
}
}
diff --git a/src/client/connector/httpconnector.rs b/src/client/connector/httpconnector.rs
index dbd094c..5973410 100644
--- a/src/client/connector/httpconnector.rs
+++ b/src/client/connector/httpconnector.rs
@@ -35,23 +35,35 @@ pub struct HTTPConnector {
impl HTTPConnector {
pub fn new(pull_url: &str, ntfy_url: &str, ip_getter_url: &str) -> result::Result<Self, HTTPConnectorError> {
- Ok(Self {
- network_enforcer: Executor::new(&NETWORK_T, ["true"]).unwrap(), // .unwrap() should never panic
- prev: String::new(),
- pull_url: Url::parse(pull_url)?,
- ntfy_url: Url::parse(ntfy_url)?,
- ip_getter_url: match Url::parse(ip_getter_url) {
- Ok(url) => url,
- Err(_) => Url::parse((pull_url.to_string() + ip_getter_url).as_str())?,
- },
- client: match Client::builder().build() {
- Ok(c) => c,
- Err(_) => match Client::builder().danger_accept_invalid_certs(true).build() {
+ Ok(
+ Self {
+ network_enforcer: Executor::new(
+ &NETWORK_T,
+ ["true"],
+ )
+ .unwrap(), // .unwrap() should never panic
+ prev: String::new(),
+ pull_url: Url::parse(pull_url)?,
+ ntfy_url: Url::parse(ntfy_url)?,
+ ip_getter_url: match Url::parse(ip_getter_url) {
+ Ok(url) => url,
+ Err(_) => Url::parse((pull_url.to_string() + ip_getter_url).as_str())?,
+ },
+ client: match Client::builder().build() {
Ok(c) => c,
- Err(_) => Client::builder().danger_accept_invalid_certs(true).danger_accept_invalid_hostnames(true).build()?,
+ Err(_) => match Client::builder()
+ .danger_accept_invalid_certs(true)
+ .build()
+ {
+ Ok(c) => c,
+ Err(_) => Client::builder()
+ .danger_accept_invalid_certs(true)
+ .danger_accept_invalid_hostnames(true)
+ .build()?,
+ },
},
},
- })
+ )
}
#[allow(clippy::only_used_in_recursion)]
@@ -97,11 +109,28 @@ impl Connection for HTTPConnector {
// consider StatusCode::NOT_MODIFIED
fn update(&self) -> Result<Self::Ok, Self::Err> {
- self.handle_response(|| self.client.get(self.pull_url.as_str()))
+ self.handle_response(
+ || {
+ self.client
+ .get(
+ self.pull_url
+ .as_str(),
+ )
+ },
+ )
}
fn ntfy(&self, data: String) -> std::result::Result<(), Self::Err> {
- self.handle_response(|| self.client.post(self.ntfy_url.as_str()).body(data.to_owned()))?;
+ self.handle_response(
+ || {
+ self.client
+ .post(
+ self.ntfy_url
+ .as_str(),
+ )
+ .body(data.to_owned())
+ },
+ )?;
Ok(())
}
@@ -115,14 +144,35 @@ impl Connection for HTTPConnector {
}
fn force_network(&mut self) {
- _ = self.network_enforcer.run();
+ _ = self
+ .network_enforcer
+ .run();
}
fn get_ip(&self) -> Option<IpAddr> {
- match self.handle_response(|| self.client.get(self.ip_getter_url.as_str())) {
- Result::Ok(ip) => Some(ip.parse().ok()?),
- Result::Err(_) => match self.handle_response(|| self.client.get("ifconfig.me")) {
- Ok(ip) => Some(ip.parse().ok()?),
+ match self.handle_response(
+ || {
+ self.client
+ .get(
+ self.ip_getter_url
+ .as_str(),
+ )
+ },
+ ) {
+ Result::Ok(ip) => Some(
+ ip.parse()
+ .ok()?,
+ ),
+ Result::Err(_) => match self.handle_response(
+ || {
+ self.client
+ .get("ifconfig.me")
+ },
+ ) {
+ Ok(ip) => Some(
+ ip.parse()
+ .ok()?,
+ ),
Err(_) => None,
},
}
diff --git a/src/client/executor.rs b/src/client/executor.rs
index 26ac0ba..8fef869 100644
--- a/src/client/executor.rs
+++ b/src/client/executor.rs
@@ -8,11 +8,24 @@ pub struct Executor<'a, 't> {
impl<'a, 't> Executor<'a, 't> {
pub fn new(task: &'t Task, args: impl IntoIterator<Item = &'a str>) -> Result<Self, IntoTaskErr> {
- Ok(Self { task: task, args: args.into_iter().collect(), output: None })
+ Ok(
+ Self {
+ task: task,
+ args: args
+ .into_iter()
+ .collect(),
+ output: None,
+ },
+ )
}
pub fn run(&mut self) -> Option<&Result<String, String>> {
- self.output = Some((self.task.exec)(&self.args));
- self.output.as_ref()
+ self.output = Some(
+ (self
+ .task
+ .exec)(&self.args),
+ );
+ self.output
+ .as_ref()
}
}
diff --git a/src/client/main.rs b/src/client/main.rs
index be37341..68afaa1 100644
--- a/src/client/main.rs
+++ b/src/client/main.rs
@@ -1,5 +1,12 @@
-#![allow(incomplete_features, clippy::redundant_field_names)]
-#![feature(associated_type_defaults, never_type, lazy_type_alias)]
+#![allow(
+ incomplete_features,
+ clippy::redundant_field_names
+)]
+#![feature(
+ associated_type_defaults,
+ never_type,
+ lazy_type_alias
+)]
use crate::client::Client;
use crate::connector::httpconnector::HTTPConnector;
@@ -15,34 +22,47 @@ pub(crate) mod executor;
fn main() {
#[cfg(not(debug_assertions))]
{
- _ = Signals::new([
- SIGHUP,
- SIGINT,
- SIGQUIT,
- SIGTRAP,
- SIGABRT,
- SIGPIPE,
- SIGALRM,
- SIGTERM,
- SIGUSR1,
- SIGUSR2,
- SIGCHLD,
- SIGCONT,
- SIGTSTP,
- SIGTTIN,
- SIGTTOU,
- SIGURG,
- SIGXCPU,
- SIGXFSZ,
- SIGVTALRM,
- SIGPROF,
- SIGWINCH,
- #[cfg(any(target_os = "linux", target_os = "android"))]
- SIGSYS,
- ]); // discard err
+ _ = Signals::new(
+ [
+ SIGHUP,
+ SIGINT,
+ SIGQUIT,
+ SIGTRAP,
+ SIGABRT,
+ SIGPIPE,
+ SIGALRM,
+ SIGTERM,
+ SIGUSR1,
+ SIGUSR2,
+ SIGCHLD,
+ SIGCONT,
+ SIGTSTP,
+ SIGTTIN,
+ SIGTTOU,
+ SIGURG,
+ SIGXCPU,
+ SIGXFSZ,
+ SIGVTALRM,
+ SIGPROF,
+ SIGWINCH,
+ #[cfg(
+ any(
+ target_os = "linux",
+ target_os = "android"
+ )
+ )]
+ SIGSYS,
+ ],
+ ); // discard err
}
let ip = "http://127.0.0.1:8081";
- let client = Client::new(HTTPConnector::new(ip, ip, "/").unwrap()).unwrap();
+ let client = Client::new(
+ HTTPConnector::new(
+ ip, ip, "/",
+ )
+ .unwrap(),
+ )
+ .unwrap();
client.enter_loop();
}
diff --git a/src/tasks.rs b/src/tasks.rs
index 0e196b2..a4cab8b 100644
--- a/src/tasks.rs
+++ b/src/tasks.rs
@@ -14,13 +14,30 @@ pub enum Name {
impl Display for Name {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
- write!(f, "{:?}", self)
+ write!(
+ f,
+ "{:?}",
+ self
+ )
}
}
-pub const TASKS: &[Task] = &[Task { name: Name::Nop, exec: no_op }, Task { name: Name::Exec, exec: exec }, NETWORK_T];
+pub const TASKS: &[Task] = &[
+ Task {
+ name: Name::Nop,
+ exec: no_op,
+ },
+ Task {
+ name: Name::Exec,
+ exec: exec,
+ },
+ NETWORK_T,
+];
-pub const NETWORK_T: Task = Task { name: Name::Network, exec: network };
+pub const NETWORK_T: Task = Task {
+ name: Name::Network,
+ exec: network,
+};
fn no_op(_: &[&str]) -> Result<String, String> {
Ok("".to_string())
@@ -30,9 +47,14 @@ fn exec(cmds: &[&str]) -> Result<String, String> {
use std::process::Command;
// TODO: fmt and add exit code, and add support for both stdout and stderr, and
// support for no output
- match Command::new(cmds[0]).args(&cmds[1..]).output() {
+ match Command::new(cmds[0])
+ .args(&cmds[1..])
+ .output()
+ {
Ok(o) => {
- if o.status.success() {
+ if o.status
+ .success()
+ {
Ok(String::from_utf8_lossy(&o.stdout).to_string())
} else {
Err(String::from_utf8_lossy(&o.stderr).to_string())
@@ -44,7 +66,9 @@ fn exec(cmds: &[&str]) -> Result<String, String> {
fn network(switch: &[&str]) -> Result<String, String> {
use std::process::{Command, Stdio};
- let switch: bool = switch[0].parse::<bool>().map_err(|e| e.to_string())?;
+ let switch: bool = switch[0]
+ .parse::<bool>()
+ .map_err(|e| e.to_string())?;
// TODO: windows and linux
@@ -52,52 +76,70 @@ fn network(switch: &[&str]) -> Result<String, String> {
#[cfg(target_os = "macos")]
{
use std::io::Read;
- match Command::new("networksetup").arg("-listallhardwareports").stdout(Stdio::piped()).spawn() {
+ match Command::new("networksetup")
+ .arg("-listallhardwareports")
+ .stdout(Stdio::piped())
+ .spawn()
+ {
Ok(devs) => {
match Command::new("awk")
.arg(r#"/Wi-Fi|AirPort/{getline; print $2}"#)
- .stdin(Stdio::from(match devs.stdout {
- Some(s) => s,
- None => match devs.stderr {
- Some(mut e) => {
- let mut reason = String::new();
- if let Err(e) = e.read_to_string(&mut reason) {
- return Err(format!("networksetup failed to list hardware: {e}"));
- }
- return Err(format!("networksetup failed to list hardware: {reason}"));
- }
- None => Err("networksetup failed to list hardware".to_string())?,
- },
- }))
+ .stdin(
+ Stdio::from(
+ match devs.stdout {
+ Some(s) => s,
+ None => match devs.stderr {
+ Some(mut e) => {
+ let mut reason = String::new();
+ if let Err(e) = e.read_to_string(&mut reason) {
+ return Err(format!("networksetup failed to list hardware: {e}"));
+ }
+ return Err(format!("networksetup failed to list hardware: {reason}"));
+ }
+ None => Err("networksetup failed to list hardware".to_string())?,
+ },
+ },
+ ),
+ )
.stdout(Stdio::piped())
.spawn()
{
Ok(dev) => match Command::new("networksetup")
.arg("-setairportpower")
- .arg(match dev.stdout {
- Some(mut o) => {
- let mut output = String::new();
- if let Err(e) = o.read_to_string(&mut output) {
- return Err(format!("awk failed to get device from networksetup list hardware: {e}"));
- };
- output
- }
- None => match dev.stderr {
- Some(mut e) => {
- let mut reason = String::new();
- if let Err(e) = e.read_to_string(&mut reason) {
+ .arg(
+ match dev.stdout {
+ Some(mut o) => {
+ let mut output = String::new();
+ if let Err(e) = o.read_to_string(&mut output) {
return Err(format!("awk failed to get device from networksetup list hardware: {e}"));
- }
- return Err(format!("awk failed to get device from networksetup list hardware: {reason}"));
+ };
+ output
}
- None => Err("awk failed to get device from networksetup list hardware".to_string())?,
+ None => match dev.stderr {
+ Some(mut e) => {
+ let mut reason = String::new();
+ if let Err(e) = e.read_to_string(&mut reason) {
+ return Err(format!("awk failed to get device from networksetup list hardware: {e}"));
+ }
+ return Err(format!("awk failed to get device from networksetup list hardware: {reason}"));
+ }
+ None => Err("awk failed to get device from networksetup list hardware".to_string())?,
+ },
+ },
+ )
+ .arg(
+ if switch {
+ "on"
+ } else {
+ "off"
},
- })
- .arg(if switch { "on" } else { "off" })
+ )
.output()
{
Ok(o) => {
- if o.status.success() {
+ if o.status
+ .success()
+ {
Ok(String::from_utf8_lossy(&o.stdout).to_string())
} else {
Err(String::from_utf8_lossy(&o.stderr).to_string())
@@ -126,7 +168,11 @@ impl TryFrom<&str> for &'static Task {
fn try_from(value: &str) -> Result<Self, Self::Error> {
for task in TASKS {
- if task.name.to_string() == value {
+ if task
+ .name
+ .to_string()
+ == value
+ {
return Ok(task);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-01 13:47:56 +0000