daxvena/elemeld - Change AGPU6SD7V5FQNI6W54HDRJQCVHWYCZIHDHL6IL5LVVMJ7SVJL7UAC

Setup websockets for cluster configuration

Created by daxvena on March 28, 2016

AGPU6SD7V5FQNI6W54HDRJQCVHWYCZIHDHL6IL5LVVMJ7SVJL7UAC

Dependencies

In channels

main

Change contents

Insertion in Cargo.lock at line 18 [5.34]

[5.605]

[2.75]

 "ws 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

Replacement in Cargo.lock at line 32 [5.34]
B:BD[5.708] → [5.708:727]
```
version = "0.13.1"
```
[5.708]
[5.727]
```
version = "0.14.0"
```

Insertion in Cargo.lock at line 59 [5.34]

[6.547]

source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "byteorder"
version = "0.5.1"

Replacement in Cargo.lock at line 81 [5.34]

B:BD[7.435] → [7.435:508]

 "regex 0.1.58 (registry+https://github.com/rust-lang/crates.io-index)",

[7.435]

[7.508]

 "regex 0.1.59 (registry+https://github.com/rust-lang/crates.io-index)",

Replacement in Cargo.lock at line 116 [5.34]

B:BD[8.566] → [7.816:889]

 "regex 0.1.58 (registry+https://github.com/rust-lang/crates.io-index)",

[8.566]

[5.1643]

 "regex 0.1.59 (registry+https://github.com/rust-lang/crates.io-index)",

Insertion in Cargo.lock at line 118 [5.34]

[5.1645]


[[package]]
name = "httparse"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

Insertion in Cargo.lock at line 150 [5.34]

[8.795]


[[package]]
name = "matches"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"

Insertion in Cargo.lock at line 165 [5.34]

[5.2367]

name = "mempool"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]

Replacement in Cargo.lock at line 237 [5.34]
B:BD[5.4745] → [5.4745:4763]
```
version = "0.7.0"
```
[5.4745]
[5.4763]
```
version = "0.8.0"
```
Replacement in Cargo.lock at line 242 [5.34]
B:BD[5.4864] → [5.4864:4882]
```
version = "0.7.0"
```
[5.4864]
[5.4882]
```
version = "0.8.0"
```

Replacement in Cargo.lock at line 245 [5.34]

B:BD[5.4964] → [5.4964:5037]

 "aster 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",

[5.4964]

[5.5037]

 "aster 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",

Replacement in Cargo.lock at line 250 [5.34]
B:BD[5.5074] → [5.5074:5092]
```
version = "0.7.0"
```
[5.5074]
[5.5092]
```
version = "0.8.0"
```

Replacement in Cargo.lock at line 253 [5.34]

B:BD[5.5174] → [5.5174:5254]

 "quasi_codegen 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

[5.5174]

[6.801]

 "quasi_codegen 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

Replacement in Cargo.lock at line 266 [5.34]
B:BD[8.874] → [7.1351:1370]
```
version = "0.1.58"
```
[8.874]
[8.893]
```
version = "0.1.59"
```

Replacement in Cargo.lock at line 271 [5.34]

B:BD[8.1128] → [7.1371:1450]

 "regex-syntax 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

[8.1128]

[8.1207]

 "mempool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

Replacement in Cargo.lock at line 278 [5.34]
B:BD[8.1321] → [7.1451:1469]
```
version = "0.3.0"
```
[8.1321]
[7.1469]
```
version = "0.3.1"
```
Replacement in Cargo.lock at line 293 [5.34]
B:BD[5.5403] → [5.5403:5421]
```
version = "0.7.0"
```
[5.5403]
[5.5421]
```
version = "0.7.1"
```

Replacement in Cargo.lock at line 296 [5.34]

B:BD[5.5503] → [5.5503:5727]

 "aster 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

[5.5503]

[5.5727]

 "aster 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi_macros 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

Replacement in Cargo.lock at line 315 [5.34]

B:BD[5.6142] → [5.6142:6222]

 "serde_codegen 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

[5.6142]

[5.6222]

 "serde_codegen 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "sha1"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",

Insertion in Cargo.lock at line 344 [5.34]

[7.1778]

[5.6685]

]
[[package]]
name = "unicode-bidi"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "unicode-normalization"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "url"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",

Insertion in Cargo.lock at line 374 [5.34]

[8.1457]

source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "uuid"
version = "0.1.18"

Insertion in Cargo.lock at line 380 [5.34]

[8.1522]

[5.6687]

dependencies = [
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
]

Insertion in Cargo.lock at line 396 [5.34]

[5.6930]

name = "ws"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "httparse 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha1 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

Insertion in Cargo.toml at line 8 [9.18912]
[9.19031]
[10.0]
```
ws = "*"
```

Insertion in src/cluster.rs at line 312 [11.13]

[11.6415]


    pub fn get_screens(&self) -> &[Screen] {
        &self.screens
    }
    pub fn set_screens(&mut self, screens: Vec<Screen>) {
        self.screens = screens;
        self.reset_local_screen();
    }

File addition: config_server.rs (-rw-r--r--)

[9.6]

use io::*;
use mio;
use ws::*;
use serde_json;
pub struct ConfigServer {
    client: Sender,
    server: mio::Sender<(NetEvent, Sender)>,
}
impl ConfigServer {
    pub fn new(client: Sender, server: mio::Sender<(NetEvent, Sender)>) -> Self {
        ConfigServer { client: client, server: server }
    }
}
impl Handler for ConfigServer {
    fn on_open(&mut self, _: Handshake) -> Result<()> {
        self.server.send((NetEvent::RequestCluster, self.client.clone())).unwrap();
        Ok(())
    }
    fn on_message(&mut self, msg: Message) -> Result<()> {
        let msg = msg.as_text().unwrap();
        let event = serde_json::from_str(msg).unwrap();
        self.server.send((event, self.client.clone())).unwrap();
        Ok(())
    }
}

Insertion in src/elemeld.rs at line 5 [11.8294]
[12.490]
[11.8325]
```
use config_server::ConfigServer;
```
Insertion in src/elemeld.rs at line 8 [11.8294]
[13.1225]
[12.514]
```
use ws::{WebSocket, Sender as WsSender};
use serde_json;
```
Insertion in src/elemeld.rs at line 13 [11.8294]
[13.1265]
[13.1265]
```
use std::thread;
```
Insertion in src/elemeld.rs at line 22 [11.8294]
[12.707]
[12.707]
```
    clients: Option<WsSender>,
```

Replacement in src/elemeld.rs at line 40 [11.8294]

B:BD[12.862] → [13.1400:1491]

B:BD[13.1491] → [3.246:283]

    pub fn new(event_loop: &mut EventLoop<Self>, config: &'a Config) -> io::Result<Self> {
        // Initialize host interface

[12.862]

[12.978]

    pub fn new(config: &'a Config) -> io::Result<Self> {

Replacement in src/elemeld.rs at line 42 [11.8294]

B:BD[12.1019] → [13.1492:1685]

        try!(event_loop.register(&host,
                                 HOST_EVENT,
                                 EventSet::readable(),
                                 PollOpt::level()));

[12.1019]

[12.1210]

        let net = try!(IpInterface::open(config));

Deletion in src/elemeld.rs at line 44 [11.8294]
B:BD[12.1211] → [3.284:314]
```
        // Initialize cluster
```

Deletion in src/elemeld.rs at line 48 [11.8294]

B:BD[11.8783] → [3.315:351]

∅:D[3.351] → [13.1686:1986]

B:BD[12.1326] → [13.1686:1986]

∅:D[13.1986] → [12.1618:1619]

B:BD[12.1618] → [12.1618:1619]

        // Initialize net interface
        let net = try!(IpInterface::open(config));
        try!(event_loop.register(&net,
                                 NET_EVENT,
                                 EventSet::readable() |
                                 EventSet::writable(),
                                 PollOpt::oneshot()));

Insertion in src/elemeld.rs at line 52 [11.8294]
[11.8847]
[11.8847]
```
            clients: None,
```

Insertion in src/elemeld.rs at line 55 [11.8294]

[13.2020]

[11.8951]

    }
    pub fn run(&mut self) -> io::Result<()> {
        let mut event_loop = try!(EventLoop::new());
        try!(event_loop.register(&self.host,
                                 HOST_EVENT,
                                 EventSet::readable(),
                                 PollOpt::level()));
        try!(event_loop.register(&self.net,
                                 NET_EVENT,
                                 EventSet::readable() |
                                 EventSet::writable(),
                                 PollOpt::oneshot()));
        let channel = event_loop.channel();
        let socket = WebSocket::new(move |out| {
            ConfigServer::new(out, channel.clone())
        }).unwrap();
        self.clients = Some(socket.broadcaster());
        thread::spawn(move || {
            socket.listen("127.0.0.1:3012").unwrap();
            warn!("Configuration server has shutdown");
        });
        try!(event_loop.run(self));
        // TODO: Should probably kill spawned threads
        Ok(())

Replacement in src/elemeld.rs at line 92 [11.8294]

B:BD[12.1910] → [13.2075:2200]

                    NetEvent::Focus(focus) => {
                        match self.net.send_to_all(NetEvent::Focus(focus)) {

[12.1910]

[13.2200]

                    NetEvent::Focus(_) => {
                        match self.net.send_to_all(&event) {

Replacement in src/elemeld.rs at line 104 [11.8294]

B:BD[12.2192] → [13.2478:2540]

                        match self.net.send_to(event, addr) {

[12.2192]

[13.2540]

                        match self.net.send_to(&event, addr) {

Insertion in src/elemeld.rs at line 116 [11.8294]
[11.9252]
[13.2694]
```
    #[allow(unused_variables)]
```
Insertion in src/elemeld.rs at line 118 [11.8294]
[13.2764]
[12.2352]
```
        self.broadcast_net_event(&event);
```

Replacement in src/elemeld.rs at line 123 [11.8294]

B:BD[12.2504] → [13.2810:2898]

                match self.net.send_to(NetEvent::Cluster(self.cluster.clone()), addr) {

[12.2504]

[13.2898]

                let event = NetEvent::Cluster(self.cluster.clone());
                match self.net.send_to_all(&event) {

Insertion in src/elemeld.rs at line 132 [11.8294]

[12.2809]

            },
            NetEvent::RequestCluster => {
                match self.net.send_to(&NetEvent::Cluster(self.cluster.clone()), addr) {
                    Err(err) => error!("Failed to passively connect: {}", err),
                    _ => (),
                };

Insertion in src/elemeld.rs at line 139 [11.8294]

[12.2824]

            NetEvent::Screens(screens) => {
                self.cluster.set_screens(screens);
            },

Insertion in src/elemeld.rs at line 151 [11.8294]

[12.3173]

        }
    }
    fn send_net_event(&self, event: &NetEvent, sender: &WsSender) {
        let msg = serde_json::to_string(&event).unwrap();
        sender.send(msg).unwrap();
    }
    fn broadcast_net_event(&self, event: &NetEvent) {
        match self.clients {
            Some(ref clients) => self.send_net_event(event, clients),
            _ => unreachable!("Cannot broadcast without clients"),

Replacement in src/elemeld.rs at line 169 [11.8294]
B:BD[12.3255] → [12.3255:3278]
```
    type Message = ();
```
[12.3255]
[12.3278]
```
    type Message = (NetEvent, WsSender);
```

Replacement in src/elemeld.rs at line 201 [11.8294]

B:BD[12.4123] → [13.3465:3563]

                            match self.net.send_to_all(NetEvent::Connect(self.cluster.clone())) {

[12.4123]

[13.3563]

                            let event = NetEvent::Connect(self.cluster.clone());
                            self.broadcast_net_event(&event);
                            match self.net.send_to_all(&event) {

Insertion in src/elemeld.rs at line 221 [11.8294]

[11.10883]


    fn notify(&mut self, _: &mut EventLoop<Self>, msg: Self::Message) {
        match msg.0 {
            NetEvent::RequestCluster => {
                self.send_net_event(&NetEvent::Cluster(self.cluster.clone()), &msg.1);
            },
            NetEvent::Screens(screens) => {
                self.cluster.set_screens(screens);
                self.net.send_to_all(&NetEvent::Cluster(self.cluster.clone())).unwrap();
            },
            event => warn!("Unexpected config event: {:?}", event),
        }
    }

Replacement in src/io.rs at line 1 [14.11]
B:BD[14.11] → [13.3870:3901]
```
use cluster::{Cluster, Focus};
```
[14.11]
[13.3901]
```
use cluster::{Cluster, Screen, Focus};
```

Replacement in src/io.rs at line 18 [14.11]

B:BD[11.11044] → [13.3916:4071]

    fn send_to(&self, event: NetEvent, addr: &SocketAddr) -> io::Result<Option<()>>;
    fn send_to_all(&self, event: NetEvent) -> io::Result<Option<()>>;

[11.11044]

[13.4071]

    fn send_to(&self, event: &NetEvent, addr: &SocketAddr) -> io::Result<Option<()>>;
    fn send_to_all(&self, event: &NetEvent) -> io::Result<Option<()>>;

Insertion in src/io.rs at line 35 [14.11]
[13.4165]
[13.4165]
```
    RequestCluster,
```
Insertion in src/io.rs at line 37 [14.11]
[13.4187]
[13.4187]
```
    Screens(Vec<Screen>),
```

Replacement in src/ip.rs at line 34 [11.11607]

B:BD[12.5256] → [13.4853:4939]

B:BD[13.4939] → [6.1152:1242]

    fn send_to(&self, event: NetEvent, addr: &SocketAddr) -> io::Result<Option<()>> {
        let packet = bincode_serde::serialize(&event, SizeLimit::Bounded(1024)).unwrap();

[12.5256]

[6.1242]

    fn send_to(&self, event: &NetEvent, addr: &SocketAddr) -> io::Result<Option<()>> {
        let packet = bincode_serde::serialize(event, SizeLimit::Bounded(1024)).unwrap();

Replacement in src/ip.rs at line 47 [11.11607]

B:BD[11.13116] → [13.5330:5401]

    fn send_to_all(&self, event: NetEvent) -> io::Result<Option<()>> {

[11.13116]

[12.5347]

    fn send_to_all(&self, event: &NetEvent) -> io::Result<Option<()>> {

Insertion in src/main.rs at line 9 [9.10002]
[9.10077]
[10.773]
```
extern crate ws;
```
Insertion in src/main.rs at line 22 [9.10002]
[11.14941]
[11.14941]
```
mod config_server;
```
Replacement in src/main.rs at line 30 [9.10002]
B:BD[12.5823] → [13.6495:6525]
```
use mio::{IpAddr, EventLoop};
```
[12.5823]
[7.2047]
```
use mio::IpAddr;
```

Replacement in src/main.rs at line 61 [9.10002]

B:BD[15.497] → [13.6680:6803]

B:BD[13.6803] → [3.486:521]

∅:D[3.521] → [12.6141:6184]

∅:D[13.6803] → [12.6141:6184]

B:BD[12.6141] → [12.6141:6184]

    let mut event_loop = EventLoop::new().unwrap();
    let mut elemeld = Elemeld::new(&mut event_loop, &config).unwrap();
    info!("Starting event loop");
    event_loop.run(&mut elemeld).unwrap();

[15.497]

[9.14598]

    let mut elemeld = Elemeld::new(&config).unwrap();
    elemeld.run().unwrap();

Replacement in web-ui/js/core.js at line 299 [17.1401]

∅:D[4.7449] → [16.7900:7951]

B:BD[17.5098] → [16.7900:7951]

    new Canvas(document.querySelector('.canvas'));

[4.7449]

[17.5145]

    var ws = new WebSocket("ws://127.0.0.1:3012");
    ws.onopen = function(e) {
        new Canvas(document.querySelector('.canvas'));
    };
    ws.onmessage = function(e) {
        var obj = JSON.parse(e.data);
        var type = Object.keys(obj)[0];
        var event = obj[type];
        switch(type) {
        case "Screens":
            console.log(event);
            break;
        }
    };

Setup websockets for cluster configuration

Dependencies

In channels

Change contents

Insertion in Cargo.lock at line 18 [5.34]

Replacement in Cargo.lock at line 32 [5.34]

Insertion in Cargo.lock at line 59 [5.34]

Replacement in Cargo.lock at line 81 [5.34]

Replacement in Cargo.lock at line 116 [5.34]

Insertion in Cargo.lock at line 118 [5.34]

Insertion in Cargo.lock at line 150 [5.34]

Insertion in Cargo.lock at line 165 [5.34]

Replacement in Cargo.lock at line 237 [5.34]

Replacement in Cargo.lock at line 242 [5.34]

Replacement in Cargo.lock at line 245 [5.34]

Replacement in Cargo.lock at line 250 [5.34]

Replacement in Cargo.lock at line 253 [5.34]

Replacement in Cargo.lock at line 266 [5.34]

Replacement in Cargo.lock at line 271 [5.34]

Replacement in Cargo.lock at line 278 [5.34]

Replacement in Cargo.lock at line 293 [5.34]

Replacement in Cargo.lock at line 296 [5.34]

Replacement in Cargo.lock at line 315 [5.34]

Insertion in Cargo.lock at line 344 [5.34]

Insertion in Cargo.lock at line 374 [5.34]

Insertion in Cargo.lock at line 380 [5.34]

Insertion in Cargo.lock at line 396 [5.34]

Insertion in Cargo.toml at line 8 [9.18912]

Insertion in src/cluster.rs at line 312 [11.13]

File addition: config_server.rs (-rw-r--r--)

Insertion in src/elemeld.rs at line 5 [11.8294]

Insertion in src/elemeld.rs at line 8 [11.8294]

Insertion in src/elemeld.rs at line 13 [11.8294]

Insertion in src/elemeld.rs at line 22 [11.8294]

Replacement in src/elemeld.rs at line 40 [11.8294]

Replacement in src/elemeld.rs at line 42 [11.8294]

Deletion in src/elemeld.rs at line 44 [11.8294]

Deletion in src/elemeld.rs at line 48 [11.8294]

Insertion in src/elemeld.rs at line 52 [11.8294]

Insertion in src/elemeld.rs at line 55 [11.8294]

Replacement in src/elemeld.rs at line 92 [11.8294]

Replacement in src/elemeld.rs at line 104 [11.8294]

Insertion in src/elemeld.rs at line 116 [11.8294]

Insertion in src/elemeld.rs at line 118 [11.8294]

Replacement in src/elemeld.rs at line 123 [11.8294]

Insertion in src/elemeld.rs at line 132 [11.8294]

Insertion in src/elemeld.rs at line 139 [11.8294]

Insertion in src/elemeld.rs at line 151 [11.8294]

Replacement in src/elemeld.rs at line 169 [11.8294]

Replacement in src/elemeld.rs at line 201 [11.8294]

Insertion in src/elemeld.rs at line 221 [11.8294]

Replacement in src/io.rs at line 1 [14.11]

Replacement in src/io.rs at line 18 [14.11]

Insertion in src/io.rs at line 35 [14.11]

Insertion in src/io.rs at line 37 [14.11]

Replacement in src/ip.rs at line 34 [11.11607]

Replacement in src/ip.rs at line 47 [11.11607]

Insertion in src/main.rs at line 9 [9.10002]

Insertion in src/main.rs at line 22 [9.10002]

Replacement in src/main.rs at line 30 [9.10002]

Replacement in src/main.rs at line 61 [9.10002]

Replacement in web-ui/js/core.js at line 299 [17.1401]