Compare commits
1 Commits
main
...
aa10f715ed
Author | SHA1 | Date | |
---|---|---|---|
|
aa10f715ed |
@@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
## [0.0.4] - 2025-08-03
|
||||
|
||||
### Added
|
||||
- pipe output
|
||||
- replace bytes with string to avoid endianness
|
||||
- sanitise output
|
||||
- replace output spawn with native tokio method
|
||||
|
||||
|
@@ -3,7 +3,7 @@ syntax = "proto3";
|
||||
package voidpin.v1;
|
||||
|
||||
message CopyRequest {
|
||||
string content = 1;
|
||||
bytes content = 1;
|
||||
}
|
||||
|
||||
message CopyResponse {}
|
||||
@@ -12,7 +12,7 @@ message PasteRequest {
|
||||
}
|
||||
|
||||
message PasteResponse {
|
||||
string content = 1;
|
||||
bytes content = 1;
|
||||
}
|
||||
|
||||
service VoidPin {
|
||||
|
@@ -54,15 +54,13 @@ impl LocalCopier {
|
||||
#[cfg(target_os = "macos")]
|
||||
let paste_process = {
|
||||
tokio::process::Command::new("pbpaste")
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()?
|
||||
};
|
||||
#[cfg(target_os = "linux")]
|
||||
let mut paste_process = {
|
||||
tokio::process::Command::new("wl-paste")
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()?
|
||||
};
|
||||
#[cfg(target_os = "windows")]
|
||||
|
@@ -3,8 +3,8 @@
|
||||
#[allow(clippy::derive_partial_eq_without_eq)]
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct CopyRequest {
|
||||
#[prost(string, tag="1")]
|
||||
pub content: ::prost::alloc::string::String,
|
||||
#[prost(bytes="vec", tag="1")]
|
||||
pub content: ::prost::alloc::vec::Vec<u8>,
|
||||
}
|
||||
#[allow(clippy::derive_partial_eq_without_eq)]
|
||||
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
|
||||
@@ -17,8 +17,8 @@ pub struct PasteRequest {
|
||||
#[allow(clippy::derive_partial_eq_without_eq)]
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct PasteResponse {
|
||||
#[prost(string, tag="1")]
|
||||
pub content: ::prost::alloc::string::String,
|
||||
#[prost(bytes="vec", tag="1")]
|
||||
pub content: ::prost::alloc::vec::Vec<u8>,
|
||||
}
|
||||
include!("voidpin.v1.tonic.rs");
|
||||
// @@protoc_insertion_point(module)
|
@@ -25,7 +25,7 @@ impl crate::grpc::void_pin_server::VoidPin for GrpcServer {
|
||||
|
||||
self.state
|
||||
.local_copier()
|
||||
.copy(&req.content.as_bytes())
|
||||
.copy(&req.content)
|
||||
.await
|
||||
.map_err(|e| tonic::Status::internal(e.to_string()))?;
|
||||
|
||||
@@ -44,7 +44,7 @@ impl crate::grpc::void_pin_server::VoidPin for GrpcServer {
|
||||
.map_err(|e| tonic::Status::internal(e.to_string()))?;
|
||||
|
||||
Ok(tonic::Response::new(crate::grpc::PasteResponse {
|
||||
content: String::from_utf8_lossy(&output).to_string(),
|
||||
content: output,
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
@@ -68,7 +68,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
tracing_subscriber::fmt()
|
||||
.with_env_filter(
|
||||
EnvFilter::builder()
|
||||
//.with_default_directive("error".parse().unwrap())
|
||||
.with_default_directive("error".parse().unwrap())
|
||||
.from_env_lossy(),
|
||||
)
|
||||
.with_writer(std::io::stderr)
|
||||
@@ -100,7 +100,10 @@ async fn main() -> anyhow::Result<()> {
|
||||
}
|
||||
|
||||
tracing::debug!(content = &input, "found content");
|
||||
state.remote_copier(&remote_host).copy(input).await?;
|
||||
state
|
||||
.remote_copier(&remote_host)
|
||||
.copy(input.as_bytes())
|
||||
.await?;
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
@@ -124,7 +127,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
if let Ok(remote_host) = std::env::var("VOIDPIN_REMOTE") {
|
||||
let output = state.remote_copier(&remote_host).paste().await?;
|
||||
|
||||
stdout.write_all(output.as_bytes()).await?;
|
||||
stdout.write_all(&output).await?;
|
||||
stdout.flush().await?;
|
||||
|
||||
return Ok(());
|
||||
@@ -147,13 +150,16 @@ async fn main() -> anyhow::Result<()> {
|
||||
}
|
||||
|
||||
tracing::debug!(content = &input, "found content");
|
||||
state.remote_copier(&remote_host).copy(input).await?;
|
||||
state
|
||||
.remote_copier(&remote_host)
|
||||
.copy(input.as_bytes())
|
||||
.await?;
|
||||
}
|
||||
RemoteCommands::Paste { remote_host } => {
|
||||
let output = state.remote_copier(&remote_host).paste().await?;
|
||||
|
||||
let mut stdout = tokio::io::stdout();
|
||||
stdout.write_all(output.as_bytes()).await?;
|
||||
stdout.write_all(&output).await?;
|
||||
stdout.flush().await?;
|
||||
}
|
||||
},
|
||||
|
@@ -17,7 +17,7 @@ impl RemoteCopier {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn copy(&self, input: String) -> anyhow::Result<()> {
|
||||
pub async fn copy(&self, input: &[u8]) -> anyhow::Result<()> {
|
||||
let tls = ClientTlsConfig::new();
|
||||
let channel = Channel::from_shared(self.host.clone())?
|
||||
.tls_config(if self.host.starts_with("https") {
|
||||
@@ -41,7 +41,7 @@ impl RemoteCopier {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn paste(&self) -> anyhow::Result<String> {
|
||||
pub async fn paste(&self) -> anyhow::Result<Vec<u8>> {
|
||||
let tls = ClientTlsConfig::new();
|
||||
let channel = Channel::from_shared(self.host.clone())?
|
||||
.tls_config(if self.host.starts_with("https") {
|
||||
@@ -59,9 +59,10 @@ impl RemoteCopier {
|
||||
let resp = client.paste(PasteRequest {}).await?;
|
||||
|
||||
let output = resp.into_inner().content;
|
||||
tracing::info!(content = output, "received paste response");
|
||||
let output = String::from_utf8_lossy(&output);
|
||||
tracing::info!(content = output.to_string(), "received paste response");
|
||||
|
||||
Ok(output)
|
||||
Ok(output.as_bytes().to_vec())
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user