chore: removed cli client

This commit is contained in:
əlemi 2023-04-11 14:00:49 +02:00
parent 4f43573aa0
commit 2472164350
3 changed files with 0 additions and 155 deletions

View file

@ -15,11 +15,6 @@ path = "src/lib/lib.rs"
name = "server"
path = "src/server/main.rs"
[[bin]]
name = "client-cli"
path = "src/client/cli/main.rs"
required-features = ["cli"]
[[bin]]
name = "client-nvim"
path = "src/client/nvim/main.rs"

View file

@ -1,46 +0,0 @@
use clap::Parser;
use codemp::proto::{buffer_client::BufferClient, BufferPayload};
use tokio_stream::StreamExt;
#[derive(Parser, Debug)]
struct CliArgs {
/// path of buffer to create
path: String,
/// initial content for buffer
#[arg(short, long)]
content: Option<String>,
/// attach instead of creating a new buffer
#[arg(long, default_value_t = false)]
attach: bool,
/// host to connect to
#[arg(long, default_value = "http://[::1]:50051")]
host: String,
}
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let args = CliArgs::parse();
let mut client = BufferClient::connect(args.host).await?;
let request = BufferPayload {
path: args.path,
content: args.content,
};
if !args.attach {
client.create(request.clone()).await.unwrap();
}
let mut stream = client.attach(request).await.unwrap().into_inner();
while let Some(item) = stream.next().await {
println!("> {:?}", item);
}
Ok(())
}

View file

@ -1,104 +0,0 @@
use std::sync::{Arc, Mutex};
use codemp::{proto::{buffer_client::BufferClient, BufferPayload, RawOp, OperationRequest}, tonic::{transport::Channel, Status, Streaming}, opfactory::OperationFactory};
use tracing::{error, warn};
use uuid::Uuid;
type FactoryHandle = Arc<Mutex<OperationFactory>>;
impl From::<BufferClient<Channel>> for CodempClient {
fn from(x: BufferClient<Channel>) -> CodempClient {
CodempClient {
id: Uuid::new_v4(),
client:x,
factory: Arc::new(Mutex::new(OperationFactory::new(None)))
}
}
}
#[derive(Clone)]
pub struct CodempClient {
id: Uuid,
client: BufferClient<Channel>,
factory: FactoryHandle, // TODO less jank solution than Arc<Mutex>
}
impl CodempClient {
pub async fn create(&mut self, path: String, content: Option<String>) -> Result<bool, Status> {
Ok(
self.client.create(
BufferPayload {
path,
content,
user: self.id.to_string(),
}
)
.await?
.into_inner()
.accepted
)
}
pub async fn insert(&mut self, path: String, txt: String, pos: u64) -> Result<bool, Status> {
let res = { self.factory.lock().unwrap().insert(&txt, pos) };
match res {
Ok(op) => {
Ok(
self.client.edit(
OperationRequest {
path,
hash: "".into(),
opseq: serde_json::to_string(&op).unwrap(),
user: self.id.to_string(),
}
)
.await?
.into_inner()
.accepted
)
},
Err(e) => Err(Status::internal(format!("invalid operation: {}", e))),
}
}
pub async fn attach<F : Fn(String) -> () + Send + 'static>(&mut self, path: String, callback: F) -> Result<(), Status> {
let stream = self.client.attach(
BufferPayload {
path,
content: None,
user: self.id.to_string(),
}
)
.await?
.into_inner();
let factory = self.factory.clone();
tokio::spawn(async move { Self::worker(stream, factory, callback).await } );
Ok(())
}
async fn worker<F : Fn(String) -> ()>(mut stream: Streaming<RawOp>, factory: FactoryHandle, callback: F) {
loop {
match stream.message().await {
Ok(v) => match v {
Some(operation) => {
let op = serde_json::from_str(&operation.opseq).unwrap();
let res = { factory.lock().unwrap().process(op) };
match res {
Ok(x) => callback(x),
Err(e) => break error!("desynched: {}", e),
}
}
None => break warn!("stream closed"),
},
Err(e) => break error!("error receiving change: {}", e),
}
}
}
pub fn content(&self) -> String {
let factory = self.factory.lock().unwrap();
factory.content()
}
}