mirror
/
fractal
mirror of https://gitlab.gnome.org/World/fractal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Can't test main loop because synapse doesn't follow the spec

environments/review-jsparber-h-cxnwl8/deployments/1
Jonas Platte 9 years ago
parent
008b63406f
commit
d0995abb73
5 changed files with 139 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      Cargo.lock
  2. 4
      Cargo.toml
  3. 45
      src/app.rs
  4. 126
      src/bg_thread.rs
  5. 1
      src/main.rs

29
Cargo.lock generated
Unescape View File

@ -5,7 +5,8 @@ dependencies = [
"futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"gio 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ruma-client 0.1.0 (git+https://github.com/ruma/ruma-client.git)",
"hyper 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ruma-client 0.1.0 (git+https://github.com/jplatte/ruma-client.git?branch=room_id-workaround)",
"tokio-core 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -44,7 +45,7 @@ name = "base64"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -52,7 +53,7 @@ name = "base64"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -73,7 +74,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "byteorder"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -81,7 +82,7 @@ name = "bytes"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -616,7 +617,7 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.1.21"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -673,14 +674,14 @@ dependencies = [
[[package]]
name = "ruma-client"
version = "0.1.0"
source = "git+https://github.com/ruma/ruma-client.git#39bd63d5769341db34e22e14ec074ca89413d8d1"
source = "git+https://github.com/jplatte/ruma-client.git?branch=room_id-workaround#186eb218de1244aaa635eee2ce7b2c425de4df43"
dependencies = [
"futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ruma-api 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ruma-client-api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ruma-client-api 0.1.0 (git+https://github.com/jplatte/ruma-client-api?branch=room_id-workaround)",
"ruma-identifiers 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -692,7 +693,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "git+https://github.com/jplatte/ruma-client-api?branch=room_id-workaround#5669b6a692f98894936534e0d5499e009e48743a"
dependencies = [
"futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -920,7 +921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1072,7 +1073,7 @@ dependencies = [
"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
"checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"
"checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
"checksum bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8b24f16593f445422331a5eed46b72f7f171f910fead4f2ea8f17e727e9c5c14"
"checksum c_vec 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6237ac5a4b1e81c213c24c6437964c61e646df910a914b4ab1487b46df20bd13"
"checksum cairo-rs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0180a8b65dc13e78479c6a47c4d5f094d64dc34465a9433c6daef9ae2fbfb3ee"
@ -1130,14 +1131,14 @@ dependencies = [
"checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d"
"checksum rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a77c51c07654ddd93f6cb543c7a849863b03abc7e82591afda6dc8ad4ac3ac4a"
"checksum rayon-core 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7febc28567082c345f10cddc3612c6ea020fc3297a1977d472cf9fdb73e6e493"
"checksum redox_syscall 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "8f4120cd9183efc5cdbac08bee870325ede495745391b0de336723b430d7a1ad"
"checksum redox_syscall 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "9df6a71a1e67be2104410736b2389fb8e383c1d7e9e792d629ff13c02867147a"
"checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
"checksum ring 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "24293de46bac74c9b9c05b40ff8496bbc8b9ae242a9b89f754e1154a43bc7c4c"
"checksum ruma-api 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5476c9703549f0ccb8b8cb208addd6b16ed1464226d884168537f5b90985afb3"
"checksum ruma-api-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7a122639190f7a7301ba180f31ce888b287c01880d3d34cc0e32a927d44548a"
"checksum ruma-client 0.1.0 (git+https://github.com/ruma/ruma-client.git)" = "<none>"
"checksum ruma-client-api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c6b50787c763fcdc44474bc45a715ee2f2d199a2dc5a0fd979872bf02312a5b"
"checksum ruma-client 0.1.0 (git+https://github.com/jplatte/ruma-client.git?branch=room_id-workaround)" = "<none>"
"checksum ruma-client-api 0.1.0 (git+https://github.com/jplatte/ruma-client-api?branch=room_id-workaround)" = "<none>"
"checksum ruma-events 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "facf7128c5dc9033b835902e68f87ecaeefaa2374ee7c96669014f7ec7241ba0"
"checksum ruma-identifiers 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e45a368130ceb92b3e88bcfbbbb38efa82e0f235bc068117559c1ba0e148c298"
"checksum ruma-signatures 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "895d8e7044367c451347f4a0327b7df1bf14a66ed6345ce431c4e8d01cdcb535"

4
Cargo.toml
Unescape View File

@ -6,6 +6,7 @@ version = "0.1.0"
[dependencies]
futures = "0.1.14"
gio = "0.1.3"
hyper = "0.11.1"
tokio-core = "0.1.8"
url = "1.5.1"
@ -14,4 +15,5 @@ features = ["v3_12"]
version = "0.1.3"
[dependencies.ruma-client]
git = "https://github.com/ruma/ruma-client.git"
git = "https://github.com/jplatte/ruma-client.git"
branch = "room_id-workaround"

45
src/app.rs
Unescape View File

@ -1,13 +1,14 @@
use std::{self, env, thread};
use std::time::Duration;
use futures;
use futures::{self, Sink};
use gio;
use gtk;
use gtk::prelude::*;
use bg_thread;
use url::Url;
use bg_thread::{self, Command, ConnectionMethod};
// TODO: Is this the correct format for GApplication IDs?
const APP_ID: &'static str = "jplatte.ruma_gtk";
@ -22,21 +23,17 @@ pub struct App {
/// Used to access the UI elements.
gtk_builder: gtk::Builder,
/// Sender to the homeserver channel.
/// Sender for the matrix channel.
///
/// With this channel, we tell the background thread to connect to a new
/// matrix homeserver. Currently, there can only be one connection to a
/// homeserver at one time, so sending a homeserver url over this channel
/// will result in the background thread first disconnecting, if it is
/// connected to another homeserver already.
homeserver_chan_tx: futures::sync::mpsc::Sender<Url>,
/// This channel is used to send commands to the background thread.
command_chan_tx: futures::sink::Wait<futures::sync::mpsc::Sender<bg_thread::Command>>,
/// Channel receiver which allows to run actions from the matrix connection thread.
///
/// Long polling is required to receive messages from the rooms and so they have to
/// run in separate threads. In order to allow those threads to modify the gtk content,
/// they will send closures to the main thread using this channel.
dispatch_chan_rx: std::sync::mpsc::Receiver<Box<Fn(&gtk::Builder) + Send>>,
ui_dispatch_chan_rx: std::sync::mpsc::Receiver<Box<Fn(&gtk::Builder) + Send>>,
/// Matrix communication thread join handler used to clean up the tread when
/// closing the application.
@ -75,24 +72,25 @@ impl App {
window.show_all();
}));
let (homeserver_chan_tx, homeserver_chan_rx) = futures::sync::mpsc::channel(1);
let (command_chan_tx, command_chan_rx) = futures::sync::mpsc::channel(1);
let command_chan_tx = command_chan_tx.wait();
// Create channel to allow the matrix connection thread to send closures to the main loop.
let (dispatch_chan_tx, dispatch_chan_rx) = std::sync::mpsc::channel();
let (ui_dispatch_chan_tx, ui_dispatch_chan_rx) = std::sync::mpsc::channel();
let bg_thread_join_handle =
thread::spawn(move || bg_thread::run(homeserver_chan_rx, dispatch_chan_tx));
thread::spawn(move || bg_thread::run(command_chan_rx, ui_dispatch_chan_tx));
App {
gtk_app,
gtk_builder,
homeserver_chan_tx,
dispatch_chan_rx,
command_chan_tx,
ui_dispatch_chan_rx,
bg_thread_join_handle,
}
}
pub fn run(self) {
pub fn run(mut self) {
// Convert the args to a Vec<&str>. Application::run requires argv as &[&str]
// and envd::args() returns an iterator of Strings.
let args = env::args().collect::<Vec<_>>();
@ -100,16 +98,27 @@ impl App {
// Poll the matrix communication thread channel and run the closures to allow
// the threads to run actions in the main loop.
let dispatch_chan_rx = self.dispatch_chan_rx;
let ui_dispatch_chan_rx = self.ui_dispatch_chan_rx;
let gtk_builder = self.gtk_builder;
gtk::idle_add(move || {
if let Ok(dispatch_fn) = dispatch_chan_rx.recv_timeout(Duration::from_millis(5)) {
if let Ok(dispatch_fn) = ui_dispatch_chan_rx.recv_timeout(Duration::from_millis(5)) {
dispatch_fn(&gtk_builder);
}
Continue(true)
});
self.command_chan_tx
.send(Command::Connect {
// TODO: https, when done debugging (or sooner)!
homeserver_url: Url::parse("http://matrix.org").unwrap(),
connection_method: ConnectionMethod::Login {
username: "TODO".to_owned(),
password: "TODO".to_owned(),
},
})
.unwrap(); // TODO: How to handle background thread crash?
// Run the main loop.
self.gtk_app.run(args_refs.len() as i32, &args_refs);

126
src/bg_thread.rs
Unescape View File

@ -1,26 +1,99 @@
use std;
use std::error::Error;
use futures::{self, Future, Stream};
use futures;
use futures::future::{self, Loop, Future};
use futures::stream::Stream;
use gtk;
use ruma_client::Client as RumaClient;
use tokio_core::reactor::{Core, Handle};
use ruma_client::{self, Client as RumaClient};
use tokio_core::reactor::{Core as TokioCore, Handle as TokioHandle};
use url::Url;
fn bg_main(
homeserver: Url,
core_handle: Handle,
homeserver_chan_rx: futures::sync::mpsc::Receiver<Url>,
dispatch_chan_tx: std::sync::mpsc::Sender<Box<Fn(&gtk::Builder) + Send>>,
) -> impl Future<Item = (), Error = Box<Error>> {
let client = RumaClient::https(&core_handle, homeserver, None).unwrap();
pub enum Command {
Connect {
homeserver_url: Url,
connection_method: ConnectionMethod,
},
}
#[derive(Clone)]
pub enum ConnectionMethod {
Login { username: String, password: String },
Guest,
//Register,
}
#[derive(Debug)]
enum Error {
RumaClientError(ruma_client::Error),
RecvError(std::sync::mpsc::RecvError),
}
impl From<ruma_client::Error> for Error {
fn from(err: ruma_client::Error) -> Error {
Error::RumaClientError(err)
}
}
impl From<std::sync::mpsc::RecvError> for Error {
fn from(err: std::sync::mpsc::RecvError) -> Error {
Error::RecvError(err)
}
}
fn bg_main<'a>(
tokio_handle: &'a TokioHandle,
command_chan_rx: futures::sync::mpsc::Receiver<Command>,
ui_dispatch_chan_tx: std::sync::mpsc::Sender<Box<Fn(&gtk::Builder) + Send>>,
) -> impl Future<Item = (), Error = Error> + 'a {
future::loop_fn(command_chan_rx, move |command_chan_rx| {
command_chan_rx
.into_future()
// Some sort of error occurred that is not the channel being closed?! Error type is (),
// so it doesn't even impl Error. Assume this will never happen (for now).
.map_err(|_| unreachable!())
.and_then(|(opt_command, command_chan_rx)| match opt_command {
Some(command) => {
let (homeserver_url, connection_method) = match command {
Command::Connect { homeserver_url, connection_method }
=> (homeserver_url, connection_method),
//_ => unimplemented!(),
};
Ok((homeserver_url, connection_method, command_chan_rx))
}
None => Err(std::sync::mpsc::RecvError.into()),
}).and_then(move |(homeserver_url, connection_method, command_chan_rx)| {
//let client = RumaClient::https(tokio_handle, homeserver_url, None).unwrap();
let client = RumaClient::new(tokio_handle, homeserver_url, None);
futures::future::ok(())
match connection_method {
ConnectionMethod::Login { username, password } => {
box client.log_in(username, password) as
Box<Future<Item = (), Error = ruma_client::Error>>
}
ConnectionMethod::Guest => box client.register_guest(),
}.and_then(move |_| {
future::loop_fn((), move |_| {
use ruma_client::api::r0::sync::sync_events;
sync_events::call(client.clone(), sync_events::Request {
filter: None,
since: None,
full_state: None,
set_presence: None,
timeout: None,
}).map(|res| {
println!("{:?}", res);
// TODO: background main loop
// TODO: use loop_fn instead of manually recursing?
Loop::Continue(())
})
})
}).map_err(Error::from)
//.select(command_chan_rx.into_future())
})
})
/*dispatch_chan_tx.send(box move |builder| {
/*ui_dispatch_chan_tx.send(box move |builder| {
builder
.get_object::<gtk::Stack>("user_button_stack")
.expect("Can't find user_button_stack in ui file.")
@ -34,24 +107,11 @@ fn bg_main(
}
pub fn run(
homeserver_chan_rx: futures::sync::mpsc::Receiver<Url>,
dispatch_chan_tx: std::sync::mpsc::Sender<Box<Fn(&gtk::Builder) + Send>>,
command_chan_rx: futures::sync::mpsc::Receiver<Command>,
ui_dispatch_chan_tx: std::sync::mpsc::Sender<Box<Fn(&gtk::Builder) + Send>>,
) {
let mut core = Core::new().unwrap();
let handle = core.handle();
let mut core = TokioCore::new().unwrap();
let tokio_handle = core.handle();
core.run(
homeserver_chan_rx
.into_future()
.map_err(|_| std::sync::mpsc::RecvError.into())
.and_then(
move |(opt_url, homeserver_chan_rx)| -> Box<Future<Item = (), Error = Box<Error>>> {
if let Some(url) = opt_url {
box bg_main(url, handle, homeserver_chan_rx, dispatch_chan_tx)
} else {
box futures::future::ok(())
}
},
),
).unwrap();
let _ = core.run(bg_main(&tokio_handle, command_chan_rx, ui_dispatch_chan_tx)).unwrap();
}

1
src/main.rs
Unescape View File

@ -6,6 +6,7 @@
//#![feature(field_init_shorthand)]
extern crate futures;
extern crate hyper;
extern crate gio;
extern crate gtk;
extern crate ruma_client;

Write Preview
Loading…
Cancel
Save