[WIP]: Wed Nov 29 12:37:22 PM EST 2023

Cargo.toml

@@ -30,6 +30,8 @@ sg-gql = { path  = "crates/sg-gql" }
 sg-types = { path  = "crates/sg-types" }
 jsonrpc = { path = "crates/jsonrpc" }
 gix = "0.52.0"
+secret-service = { version = "3.0.1", features = ["rt-tokio-crypto-rust"] }
+tiny_http = "0.12.0"
 
 [workspace.dependencies]
 anyhow = "1"
@@ -40,7 +42,6 @@ serde_json = "1.0"
 
 graphql_client = { version = "0.13.0", features = ["reqwest", "reqwest-blocking"] }
 reqwest = { version = "0.11", features = ["native-tls-vendored"] }
-openssl = { version = "0.10", features = ["vendored"] }
 
 lsp-types = "0.94.0"
 url = "2.4.0"

crates/jsonrpc/src/lib.rs

@@ -1,22 +1,18 @@
-use serde::Deserialize;
-
 use {
     anyhow::Result,
-    serde::{de::DeserializeOwned, Serialize},
+    serde::{de::DeserializeOwned, Deserialize, Serialize},
     std::io,
+    tokio::sync::Mutex,
 };
 
 type MessageReader = dyn tokio::io::AsyncBufRead + Unpin + Send;
 
-pub async fn write_msg(
-    mut out: impl tokio::io::AsyncWrite + Unpin,
-    req: impl Serialize,
-) -> Result<()> {
+pub async fn write_msg(out: &Mutex<tokio::io::Stdout>, req: impl Serialize) -> Result<()> {
     use tokio::io::AsyncWriteExt;
-
     let msg = serde_json::to_string(&req)?;
-
     let header = format!("Content-Length: {}\r\n\r\n", msg.len());
+
+    let out = &mut *out.lock().await;
     out.write_all(header.as_bytes()).await?;
     out.write_all(msg.as_bytes()).await?;
     out.flush().await?;
@@ -30,12 +26,13 @@ pub struct RPCErr {
     pub message: String,
 }
 
-pub async fn write_err(mut out: impl tokio::io::AsyncWrite + Unpin, err: RPCErr) -> Result<()> {
+pub async fn write_err(out: &Mutex<tokio::io::Stdout>, err: RPCErr) -> Result<()> {
     use tokio::io::AsyncWriteExt;
 
     let msg = serde_json::to_string(&err)?;
-
     let header = format!("Content-Length: {}\r\n\r\n", msg.len());
+
+    let out = &mut *out.lock().await;
     out.write_all(header.as_bytes()).await?;
     out.write_all(msg.as_bytes()).await?;
     out.flush().await?;
@@ -47,6 +44,8 @@ pub async fn read_msg<T>(r: &mut MessageReader) -> Result<Option<T>>
 where
     T: DeserializeOwned,
 {
+    eprintln!("Hello... reading a message...");
+
     let text = match read_msg_text(r).await? {
         None => return Ok(None),
         Some(text) => text,