mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-04-20 20:55:50 +00:00
ec0a1f1ce4
* Changes project-related structures to use `BTreeMap` instead of `HashMap` for children to aid determiniusm * Changes imfs-related structures to have total ordering and use `BTreeSet` instead of `HashSet` * Upgrades dependencies to `bx_dom_weak`1.2.0 and rbx_xml 0.5.0 to aid in more determinism stuff * Re-exposes the `RbxSession`'s root project via `root_project()` * Implements `Default` for a couple things * Tweaks visualization code to support visualizing trees not attached to an `RbxSession` * Adds an ID-invariant comparison method for `rbx_tree` relying on previous determinism changes * Adds a (disabled) test to start finding issues in the reconciler with regards to communicativity of snapshot application * Adds a snapshot testing system that operates on `RbxTree` and associated metadata, which are committed in this change
99 lines
2.4 KiB
Rust
99 lines
2.4 KiB
Rust
use std::{
|
|
collections::HashSet,
|
|
mem,
|
|
sync::{Arc, Mutex},
|
|
};
|
|
|
|
use failure::Fail;
|
|
|
|
use crate::{
|
|
fs_watcher::FsWatcher,
|
|
imfs::{Imfs, FsError},
|
|
message_queue::MessageQueue,
|
|
project::Project,
|
|
rbx_session::RbxSession,
|
|
rbx_snapshot::SnapshotError,
|
|
session_id::SessionId,
|
|
snapshot_reconciler::InstanceChanges,
|
|
};
|
|
|
|
#[derive(Debug, Fail)]
|
|
pub enum LiveSessionError {
|
|
#[fail(display = "{}", _0)]
|
|
Fs(#[fail(cause)] FsError),
|
|
|
|
#[fail(display = "{}", _0)]
|
|
Snapshot(#[fail(cause)] SnapshotError),
|
|
}
|
|
|
|
impl_from!(LiveSessionError {
|
|
FsError => Fs,
|
|
SnapshotError => Snapshot,
|
|
});
|
|
|
|
/// Contains all of the state for a Rojo live-sync session.
|
|
pub struct LiveSession {
|
|
project: Arc<Project>,
|
|
session_id: SessionId,
|
|
pub message_queue: Arc<MessageQueue<InstanceChanges>>,
|
|
pub rbx_session: Arc<Mutex<RbxSession>>,
|
|
pub imfs: Arc<Mutex<Imfs>>,
|
|
_fs_watcher: FsWatcher,
|
|
}
|
|
|
|
impl LiveSession {
|
|
pub fn new(project: Arc<Project>) -> Result<LiveSession, LiveSessionError> {
|
|
let imfs = {
|
|
let mut imfs = Imfs::new();
|
|
imfs.add_roots_from_project(&project)?;
|
|
|
|
Arc::new(Mutex::new(imfs))
|
|
};
|
|
let message_queue = Arc::new(MessageQueue::new());
|
|
|
|
let rbx_session = Arc::new(Mutex::new(RbxSession::new(
|
|
Arc::clone(&project),
|
|
Arc::clone(&imfs),
|
|
Arc::clone(&message_queue),
|
|
)?));
|
|
|
|
let fs_watcher = FsWatcher::start(
|
|
Arc::clone(&imfs),
|
|
Some(Arc::clone(&rbx_session)),
|
|
);
|
|
|
|
let session_id = SessionId::new();
|
|
|
|
Ok(LiveSession {
|
|
session_id,
|
|
project,
|
|
message_queue,
|
|
rbx_session,
|
|
imfs,
|
|
_fs_watcher: fs_watcher,
|
|
})
|
|
}
|
|
|
|
/// Restarts the live session using the given project while preserving the
|
|
/// internal session ID.
|
|
pub fn restart_with_new_project(&mut self, project: Arc<Project>) -> Result<(), LiveSessionError> {
|
|
let mut new_session = LiveSession::new(project)?;
|
|
new_session.session_id = self.session_id;
|
|
|
|
mem::replace(self, new_session);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub fn root_project(&self) -> &Project {
|
|
&self.project
|
|
}
|
|
|
|
pub fn session_id(&self) -> SessionId {
|
|
self.session_id
|
|
}
|
|
|
|
pub fn serve_place_ids(&self) -> &Option<HashSet<u64>> {
|
|
&self.project.serve_place_ids
|
|
}
|
|
} |