Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -19,9 +19,9 @@ repo_metadata.workspace = true
|
||||
serde.workspace = true
|
||||
thiserror.workspace = true
|
||||
uuid.workspace = true
|
||||
warp_core.workspace = true
|
||||
warp_util.workspace = true
|
||||
warpui.workspace = true
|
||||
galaxy_core.workspace = true
|
||||
galaxy_util.workspace = true
|
||||
galaxyui.workspace = true
|
||||
|
||||
[target.'cfg(not(target_family = "wasm"))'.dependencies]
|
||||
async-io.workspace = true
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use std::sync::Arc;
|
||||
use warpui::r#async::BoxFuture;
|
||||
use galaxyui::r#async::BoxFuture;
|
||||
type GetAuthTokenFn = dyn Fn() -> BoxFuture<'static, Option<String>> + Send + Sync;
|
||||
type RemoteServerIdentityKeyFn = dyn Fn() -> String + Send + Sync;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ use std::time::Duration;
|
||||
use dashmap::DashMap;
|
||||
use futures::channel::oneshot;
|
||||
use futures::io::{AsyncRead, AsyncWrite};
|
||||
use warpui::r#async::{executor, FutureExt as _};
|
||||
use galaxyui::r#async::{executor, FutureExt as _};
|
||||
|
||||
use crate::proto::{
|
||||
client_message, server_message, Abort, Authenticate, ClientMessage, DeleteFile, ErrorCode,
|
||||
@@ -18,8 +18,8 @@ use crate::proto::{
|
||||
|
||||
use crate::protocol::{self, ProtocolError, RequestId};
|
||||
|
||||
use warp_core::SessionId;
|
||||
use warpui::r#async::TransportStream;
|
||||
use galaxy_core::SessionId;
|
||||
use galaxyui::r#async::TransportStream;
|
||||
|
||||
/// Default request timeout (2 minutes).
|
||||
const REQUEST_TIMEOUT: Duration = Duration::from_secs(120);
|
||||
|
||||
@@ -6,8 +6,8 @@ use crate::proto::{
|
||||
InitializeResponse, RunCommandResponse, RunCommandSuccess, ServerMessage,
|
||||
};
|
||||
use crate::protocol;
|
||||
use warp_core::SessionId;
|
||||
use warpui::r#async::executor;
|
||||
use galaxy_core::SessionId;
|
||||
use galaxyui::r#async::executor;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
// Re-export from warp_core so existing `remote_server::HostId` imports
|
||||
// Re-export from galaxy_core so existing `remote_server::HostId` imports
|
||||
// continue to work.
|
||||
pub use warp_core::HostId;
|
||||
pub use galaxy_core::HostId;
|
||||
|
||||
@@ -17,8 +17,8 @@ use crate::transport::RemoteTransport;
|
||||
use crate::HostId;
|
||||
use repo_metadata::RepoMetadataUpdate;
|
||||
use serde::Serialize;
|
||||
use warp_core::SessionId;
|
||||
use warpui::{Entity, ModelContext, ModelSpawner, SingletonEntity};
|
||||
use galaxy_core::SessionId;
|
||||
use galaxyui::{Entity, ModelContext, ModelSpawner, SingletonEntity};
|
||||
|
||||
/// Maximum number of reconnection attempts after a spontaneous disconnect.
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
@@ -598,7 +598,7 @@ impl RemoteServerManager {
|
||||
transport: &dyn RemoteTransport,
|
||||
auth_context: &RemoteServerAuthContext,
|
||||
spawner: &ModelSpawner<Self>,
|
||||
executor: &Arc<warpui::r#async::executor::Background>,
|
||||
executor: &Arc<galaxyui::r#async::executor::Background>,
|
||||
) -> Result<HostId, ConnectAndHandshakeError> {
|
||||
// Phase 1: Connect (establish streams, create client).
|
||||
let Connection {
|
||||
|
||||
@@ -8,7 +8,7 @@ use repo_metadata::file_tree_update::{
|
||||
DirectoryNodeMetadata, FileNodeMetadata, FileTreeEntryUpdate, RepoMetadataUpdate,
|
||||
RepoNodeMetadata,
|
||||
};
|
||||
use warp_util::standardized_path::StandardizedPath;
|
||||
use galaxy_util::standardized_path::StandardizedPath;
|
||||
|
||||
use crate::proto;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use warp_core::channel::{Channel, ChannelState};
|
||||
use galaxy_core::channel::{Channel, ChannelState};
|
||||
|
||||
/// State machine for the remote server install → launch → initialize flow.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
@@ -124,9 +124,7 @@ pub fn remote_server_dir() -> String {
|
||||
Channel::Preview => ".warp-core-preview",
|
||||
Channel::Dev | Channel::Integration => ".warp-core-dev",
|
||||
Channel::Local => ".warp-core-local",
|
||||
Channel::Oss => {
|
||||
".warp-core-dev"
|
||||
}
|
||||
Channel::Oss => ".warp-core-dev",
|
||||
};
|
||||
format!("~/{warp_dir}/remote-server")
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ use std::time::Duration;
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use command::r#async::Command;
|
||||
use warpui::r#async::FutureExt as _;
|
||||
use galaxyui::r#async::FutureExt as _;
|
||||
|
||||
/// Timeout for `ssh -O exit`. The command only talks to the local
|
||||
/// ControlMaster over a Unix socket, so it should return almost
|
||||
|
||||
@@ -15,7 +15,7 @@ use std::path::PathBuf;
|
||||
use std::pin::Pin;
|
||||
|
||||
use async_channel::Receiver;
|
||||
use warpui::r#async::executor;
|
||||
use galaxyui::r#async::executor;
|
||||
|
||||
use crate::client::{ClientEvent, RemoteServerClient};
|
||||
use crate::setup::RemotePlatform;
|
||||
|
||||
Reference in New Issue
Block a user