Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify service discovery in development

Browse source
This commit is contained in:
Conrad Irwin 2024-01-17 23:02:36 -07:00
parent ef6f39d090
commit 4d9ff5c4ff
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/client/src/client.rs
View file

@ -52,6 +52,7 @@ pub use user::*;
lazy_static! { lazy_static! {
pub static ref ZED_SERVER_URL: String = pub static ref ZED_SERVER_URL: String =
std::env::var("ZED_SERVER_URL").unwrap_or_else(|_| "https://zed.dev".to_string()); std::env::var("ZED_SERVER_URL").unwrap_or_else(|_| "https://zed.dev".to_string());
pub static ref ZED_RPC_URL: Option<String> = std::env::var("ZED_RPC_URL").ok();
pub static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE") pub static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE")
.ok() .ok()
.and_then(|s| if s.is_empty() { None } else { Some(s) }); .and_then(|s| if s.is_empty() { None } else { Some(s) });
@ -933,6 +934,10 @@ impl Client {
http: Arc<dyn HttpClient>, http: Arc<dyn HttpClient>,
release_channel: Option<ReleaseChannel>, release_channel: Option<ReleaseChannel>,
) -> Result<Url> { ) -> Result<Url> {
if let Some(url) = &*ZED_RPC_URL {
return Url::parse(url).context("invalid rpc url");
}
let mut url = format!("{}/rpc", *ZED_SERVER_URL); let mut url = format!("{}/rpc", *ZED_SERVER_URL);
if let Some(preview_param) = if let Some(preview_param) =
release_channel.and_then(|channel| channel.release_query_param()) release_channel.and_then(|channel| channel.release_query_param())
@ -941,14 +946,6 @@ impl Client {
url += preview_param; url += preview_param;
} }
let response = http.get(&url, Default::default(), false).await?; let response = http.get(&url, Default::default(), false).await?;
// Normally, ZED_SERVER_URL is set to the URL of zed.dev website.
// The website's /rpc endpoint redirects to a collab server's /rpc endpoint,
// which requires authorization via an HTTP header.
//
// For testing purposes, ZED_SERVER_URL can also set to the direct URL of
// of a collab server. In that case, a request to the /rpc endpoint will
// return an 'unauthorized' response.
let collab_url = if response.status().is_redirection() { let collab_url = if response.status().is_redirection() {
response response
.headers() .headers()
@ -957,8 +954,6 @@ impl Client {
.to_str() .to_str()
.map_err(EstablishConnectionError::other)? .map_err(EstablishConnectionError::other)?
.to_string() .to_string()
} else if response.status() == StatusCode::UNAUTHORIZED {
url
} else { } else {
Err(anyhow!( Err(anyhow!(
"unexpected /rpc response status {}", "unexpected /rpc response status {}",

3
script/zed-local
View file

@ -111,7 +111,8 @@ setTimeout(() => {
ZED_WINDOW_POSITION: positions[i], ZED_WINDOW_POSITION: positions[i],
ZED_STATELESS: "1", ZED_STATELESS: "1",
ZED_ALWAYS_ACTIVE: "1", ZED_ALWAYS_ACTIVE: "1",
ZED_SERVER_URL: "http://localhost:8080", ZED_SERVER_URL: "http://localhost:3000",
ZED_RPC_URL: "http://localhost:8080/rpc",
ZED_ADMIN_API_TOKEN: "secret", ZED_ADMIN_API_TOKEN: "secret",
ZED_WINDOW_SIZE: `${instanceWidth},${instanceHeight}`, ZED_WINDOW_SIZE: `${instanceWidth},${instanceHeight}`,
PATH: process.env.PATH, PATH: process.env.PATH,