CaustiqueSo6/ModbusEmul - Change FC7J5ASVKIVWYSFE3N5K2HNFZR2F43UZKSEP4QSNW6PTSSGKK2NQC

Add webserver support

Created by CSBy9sFZ9ZAjy6HdMPfZxFcuYmHn7HtFiH2yq6iUvVY6 on January 28, 2022

FC7J5ASVKIVWYSFE3N5K2HNFZR2F43UZKSEP4QSNW6PTSSGKK2NQC

Dependencies

In channels

main

Change contents

Replacement in src/out.rs at line 83 [3.48]

B:BD[3.1625] → [3.1625:1684]

        let data: u32 = unsafe { std::mem::transmute(v) };

[3.1625]

[3.1684]

        let data: u32 = v.to_bits();

Replacement in src/out.rs at line 92 [3.48]

B:BD[3.1882] → [3.1882:1941]

        let data: u64 = unsafe { std::mem::transmute(v) };

[3.1882]

[3.1941]

        let data: u64 = v.to_bits();

Replacement in src/main.rs at line 5 [3.2202]

B:BD[3.2368] → [2.290:310]

use server::Server;

[3.2368]

[3.2445]

use std::{net::Ipv4Addr, time::SystemTime};
use curve_generator::RegisterType;
use serde::{Deserialize, Serialize};
use server::{Server, ServerConfig};

Insertion in src/main.rs at line 16 [3.2202]
[3.2685]
[3.2685]
```
use futures::{future::OptionFuture, SinkExt, StreamExt};
```

Insertion in src/main.rs at line 18 [3.2202]

[3.2714]

[3.3524]

use thiserror::Error;
use tokio::{
    net::{TcpListener, TcpStream},
    time::{interval, Interval},
};

Replacement in src/main.rs at line 24 [3.2202]

B:BD[3.5134] → [3.5134:5229]

fn main() {
    let s = tokio_modbus::server::tcp::Server::new(([127, 0, 0, 1], 8080).into());

[3.3525]

[3.5260]

#[tokio::main]
async fn main() {
    let srv = Server::default();

Deletion in src/main.rs at line 28 [3.2202]
B:BD[3.5261] → [2.347:380]
```
    let srv = Server::default();
```

Insertion in src/main.rs at line 31 [3.2202]

[3.6679]


    let _ = tokio::join! {
        start_modus_server(srv.clone()),
        start_ws_server(srv),
    };
}

Replacement in src/main.rs at line 38 [3.2202]

B:BD[3.6680] → [2.522:548]

    s.serve_forever(srv);

[3.6680]

[3.6704]

fn start_ws_server(server: Server) -> tokio::task::JoinHandle<()> {
    tokio::spawn(async move {
        let listener = TcpListener::bind((Ipv4Addr::UNSPECIFIED, 8888))
            .await
            .expect("Fail to bind to addr 0.0.0.0:8888");
        let (mut conf, _) = server.watch();
        let mut poll_timer = server.config().poll_interval.map(interval);
        loop {
            tokio::select! {
                o = listener.accept() => {
                    match o {
                        Ok((stream, _)) => {
                            tokio::spawn(accept_connection(stream, server.clone()));
                        },
                        Err(err) => {
                            println!("[ERROR]: {err}");
                            return;
                        }
                    }
                }
                () = conf.changed() => {
                    let poll_interval = server.config().poll_interval;
                    if poll_timer.as_ref().map(Interval::period) != poll_interval {
                        poll_timer = poll_interval.map(interval);
                    }
                }
                Some(_) = {let t: OptionFuture<_> = poll_timer.as_mut().map(Interval::tick).into(); t} => {
                    server.send_snapshot()
                }
            }
        }
    })
}
fn start_modus_server(server: Server) -> tokio::task::JoinHandle<()> {
    tokio::spawn(async move {
        let s = tokio_modbus::server::tcp::Server::new(([127, 0, 0, 1], 8000).into());
        s.serve(server).await.unwrap();
    })
}
#[derive(Debug, Deserialize)]
enum MessageIn {
    SetPoll(Option<std::time::Duration>),
    SetRegisterConf {
        reg_id: u16,
        conf: Option<RegisterType>,
    },
}
#[derive(Debug, Serialize)]
enum MessageOut {
    Configuration(ServerConfig),
    History(SystemTime, server::history::Entry),
    HistoryLagged(u64),
}
#[derive(Debug, Error)]
enum ClientError {
    #[error("io error {0}")]
    Io(#[from] std::io::Error),
    #[error("websocket error {0}")]
    Ws(#[from] async_tungstenite::tungstenite::Error),
    #[error("ser/deserialization error {0}")]
    Serde(#[from] serde_json::Error),
}
async fn accept_connection(stream: TcpStream, server: Server) -> Result<(), ClientError> {
    use async_tungstenite::tungstenite::protocol::Message;
    let (mut conf, mut hist) = server.watch();
    let mut ws_stream = async_tungstenite::tokio::accept_async(stream).await?;
    ws_stream
        .send(Message::Text(serde_json::to_string(
            &MessageOut::Configuration(server.config()),
        )?))
        .await?;
    loop {
        let msg = tokio::select! {
            Some(msg) = ws_stream.next() => {
                let m = msg?;
                if m.is_close() {
                    return Ok(())
                } else if let Ok(m) = m.to_text() {
                    let i = serde_json::from_str::<MessageIn>(m).unwrap();// TODO dont unwrap
                    match i {
                        MessageIn::SetPoll(d) => server.set_poll_interval(d),
                        MessageIn::SetRegisterConf { reg_id, conf } => server.set_register_conf(reg_id, conf),
                    }
                }
                None
            }
            h = hist.recv() => {
                use tokio::sync::broadcast::error::RecvError;
                Some(match h {
                    Ok((time, hist)) => MessageOut::History(time, hist),
                    Err(RecvError::Lagged(lag)) => MessageOut::HistoryLagged(lag),
                    // Can't be closed, we still have a handle on the server (that has the sender)
                    Err(RecvError::Closed) => unreachable!(),
                })
            }
            () = conf.changed() => {
                Some(MessageOut::Configuration(server.config()))
            }
        };
        if let Some(msg) = msg {
            ws_stream
                .send(Message::Text(serde_json::to_string(&msg)?))
                .await?;
        }
    }

Insertion in src/error.rs at line 1 [3.7503]
[3.7503]
[3.7504]
```
use serde::Serialize;
```
Replacement in src/error.rs at line 4 [3.7503]
B:BD[3.7527] → [3.7527:7558]
```
#[derive(Debug, Error, Clone)]
```
[3.7527]
[3.7558]
```
#[derive(Debug, Error, Clone, Serialize)]
```
Replacement in src/curve_generator.rs at line 125 [3.7817]
B:BD[3.10977] → [2.840:881]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.10977]
[3.10977]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 147 [3.7817]
B:BD[3.11229] → [2.1009:1050]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.11229]
[3.11229]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 155 [3.7817]
B:BD[3.11348] → [2.1051:1092]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.11348]
[2.1092]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 159 [3.7817]
B:BD[3.11448] → [3.11448:11471]
```
        self.0.clone()
```
[3.11448]
[3.11471]
```
        self.0
```
Replacement in src/curve_generator.rs at line 163 [3.7817]
B:BD[3.11480] → [2.1119:1160]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.11480]
[3.11480]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 166 [3.7817]
∅:D[2.1180] → [3.11499:11527]
B:BD[3.11499] → [3.11499:11527]
```
    pub noise: OpenSimplex,
```
[2.1180]
[3.11527]
```
    pub noise: Box<OpenSimplex>, // Box beacause it's big
```
Replacement in src/curve_generator.rs at line 182 [3.7817]
B:BD[3.11847] → [2.1181:1222]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.11847]
[3.11847]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 194 [3.7817]
B:BD[3.12098] → [2.1223:1264]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.12098]
[3.12098]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 206 [3.7817]
B:BD[3.12375] → [2.1265:1306]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.12375]
[3.12375]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 218 [3.7817]
B:BD[3.12649] → [2.1307:1348]
```
#[derive(Debug, Serialize, Deserialize)]
```
[3.12649]
[2.1348]
```
#[derive(Debug, Clone, Serialize, Deserialize)]
```

Insertion in Cargo.toml at line 9 [3.12838]

[3.13017]

async-tungstenite = { version = "0.16.1", features = ["tokio-runtime"], default-features = false }

Insertion in Cargo.toml at line 11 [3.12838]
[3.13041]
[3.13041]
```
futures = "0.3.19"
```
Insertion in Cargo.toml at line 15 [3.12838]
[2.1469]
[3.13097]
```
serde_json = "1.0.78"
```

Insertion in Cargo.lock at line 44 [3.13289]

[3.14371]

]
[[package]]
name = "async-tungstenite"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5682ea0913e5c20780fe5785abacb85a411e7437bf52a1bedb93ddb3972cb8dd"
dependencies = [
 "futures-io",
 "futures-util",
 "log",
 "pin-project-lite",
 "tokio",
 "tungstenite",

Insertion in Cargo.lock at line 79 [3.13289]

[3.14769]

name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
 "generic-array",
]
[[package]]

Insertion in Cargo.lock at line 118 [3.13289]

[3.15719]

name = "cpufeatures"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
dependencies = [
 "libc",
]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
 "generic-array",
]
[[package]]

Insertion in Cargo.lock at line 146 [3.13289]

[3.15970]


[[package]]
name = "fnv"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

Insertion in Cargo.lock at line 154 [3.13289]

[3.15983]

name = "form_urlencoded"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
dependencies = [
 "matches",
 "percent-encoding",
]
[[package]]

Insertion in Cargo.lock at line 250 [3.13289]

[3.18239]

]
[[package]]
name = "generic-array"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
dependencies = [
 "typenum",
 "version_check",

Replacement in Cargo.lock at line 270 [3.13289]

B:BD[3.18478] → [3.18478:18487]

 "wasi",

[3.18478]

[3.18487]

 "wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]]
name = "getrandom"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
dependencies = [
 "cfg-if 1.0.0",
 "libc",
 "wasi 0.10.2+wasi-snapshot-preview1",

Insertion in Cargo.lock at line 291 [3.13289]

[3.18710]

]
[[package]]
name = "http"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
dependencies = [
 "bytes",
 "fnv",
 "itoa",

Insertion in Cargo.lock at line 303 [3.13289]

[3.18712]


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

Insertion in Cargo.lock at line 311 [3.13289]

[3.18725]

name = "idna"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
dependencies = [
 "matches",
 "unicode-bidi",
 "unicode-normalization",
]
[[package]]

Insertion in Cargo.lock at line 331 [3.13289]

[3.18953]

name = "itoa"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
[[package]]

Insertion in Cargo.lock at line 379 [3.13289]

[3.20025]

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

Insertion in Cargo.lock at line 438 [3.13289]
[3.21235]
[3.21235]
```
 "async-tungstenite",
```
Insertion in Cargo.lock at line 440 [3.13289]
[3.21253]
[3.21253]
```
 "futures",
```
Insertion in Cargo.lock at line 444 [3.13289]
[2.1680]
[3.21263]
```
 "serde_json",
```
Replacement in Cargo.lock at line 482 [3.13289]
B:BD[3.22042] → [3.22042:22051]
```
 "rand",
```
[3.22042]
[3.22051]
```
 "rand 0.7.3",
```

Insertion in Cargo.lock at line 512 [3.13289]

[3.22732]

name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]

Insertion in Cargo.lock at line 541 [3.13289]

[3.23279]


[[package]]
name = "percent-encoding"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

Replacement in Cargo.lock at line 590 [3.13289]

B:BD[3.24528] → [3.24528:24542]

 "getrandom",

[3.24528]

[3.24542]

 "getrandom 0.1.16",
 "libc",
 "rand_chacha 0.2.2",
 "rand_core 0.5.1",
 "rand_hc 0.2.0",
]
[[package]]
name = "rand"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
dependencies = [

Replacement in Cargo.lock at line 604 [3.13289]

B:BD[3.24551] → [3.24551:24593]

 "rand_chacha",
 "rand_core",
 "rand_hc",

[3.24551]

[3.24593]

 "rand_chacha 0.3.1",
 "rand_core 0.6.3",
 "rand_hc 0.3.1",

Replacement in Cargo.lock at line 616 [3.13289]

B:BD[3.24822] → [3.24822:24836]

 "rand_core",

[3.24822]

[3.24836]

 "rand_core 0.5.1",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
 "ppv-lite86",
 "rand_core 0.6.3",

Replacement in Cargo.lock at line 635 [3.13289]

B:BD[3.25048] → [3.25048:25062]

 "getrandom",

[3.25048]

[3.25062]

 "getrandom 0.1.16",
]
[[package]]
name = "rand_core"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
 "getrandom 0.2.4",

Replacement in Cargo.lock at line 653 [3.13289]

B:BD[3.25272] → [3.25272:25286]

 "rand_core",

[3.25272]

[3.25286]

 "rand_core 0.5.1",
]
[[package]]
name = "rand_hc"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
dependencies = [
 "rand_core 0.6.3",

Replacement in Cargo.lock at line 671 [3.13289]
B:BD[3.25502] → [3.25502:25516]
```
 "rand_core",
```
[3.25502]
[3.25516]
```
 "rand_core 0.5.1",
```

Insertion in Cargo.lock at line 712 [3.13289]

[3.26211]

name = "ryu"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
[[package]]

Insertion in Cargo.lock at line 744 [3.13289]

[2.2400]

[3.26405]

name = "serde_json"
version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
dependencies = [
 "itoa",
 "ryu",
 "serde",
]
[[package]]

Insertion in Cargo.lock at line 768 [3.13289]

[3.26722]

]
[[package]]
name = "sha-1"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
dependencies = [
 "block-buffer",
 "cfg-if 1.0.0",
 "cpufeatures",
 "digest",
 "opaque-debug",

Insertion in Cargo.lock at line 843 [3.13289]

[3.28297]

]
[[package]]
name = "tinyvec"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
dependencies = [
 "tinyvec_macros",

Insertion in Cargo.lock at line 853 [3.13289]

[3.28299]


[[package]]
name = "tinyvec_macros"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

Insertion in Cargo.lock at line 937 [3.13289]

[3.29857]

name = "tungstenite"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1"
dependencies = [
 "base64",
 "byteorder",
 "bytes",
 "http",
 "httparse",
 "log",
 "rand 0.8.4",
 "sha-1",
 "thiserror",
 "url",
 "utf-8",
]
[[package]]
name = "typenum"
version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
[[package]]
name = "unicode-bidi"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
[[package]]
name = "unicode-normalization"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
dependencies = [
 "tinyvec",
]
[[package]]

Insertion in Cargo.lock at line 981 [3.13289]

[3.30039]


[[package]]
name = "url"
version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
dependencies = [
 "form_urlencoded",
 "idna",
 "matches",
 "percent-encoding",
]
[[package]]
name = "utf-8"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"

Insertion in Cargo.lock at line 1001 [3.13289]

[3.30052]

name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]

Insertion in Cargo.lock at line 1019 [3.13289]

[3.30451]

name = "wasi"
version = "0.10.2+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]

Add webserver support

Dependencies

In channels

Change contents

Replacement in src/out.rs at line 83 [3.48]

Replacement in src/out.rs at line 92 [3.48]

Replacement in src/main.rs at line 5 [3.2202]

Insertion in src/main.rs at line 16 [3.2202]

Insertion in src/main.rs at line 18 [3.2202]

Replacement in src/main.rs at line 24 [3.2202]

Deletion in src/main.rs at line 28 [3.2202]

Insertion in src/main.rs at line 31 [3.2202]

Replacement in src/main.rs at line 38 [3.2202]

Insertion in src/error.rs at line 1 [3.7503]

Replacement in src/error.rs at line 4 [3.7503]

Replacement in src/curve_generator.rs at line 125 [3.7817]

Replacement in src/curve_generator.rs at line 147 [3.7817]

Replacement in src/curve_generator.rs at line 155 [3.7817]

Replacement in src/curve_generator.rs at line 159 [3.7817]

Replacement in src/curve_generator.rs at line 163 [3.7817]

Replacement in src/curve_generator.rs at line 166 [3.7817]

Replacement in src/curve_generator.rs at line 182 [3.7817]

Replacement in src/curve_generator.rs at line 194 [3.7817]

Replacement in src/curve_generator.rs at line 206 [3.7817]

Replacement in src/curve_generator.rs at line 218 [3.7817]