CaustiqueSo6/ModbusEmul - Change BPRJNYXJSTO4B4SKQATQSMIO6HZWORQ4NK2BUXO3CWCBKF7P2QDQC

Refacto before integrating web server

Created by CSBy9sFZ9ZAjy6HdMPfZxFcuYmHn7HtFiH2yq6iUvVY6 on January 24, 2022

BPRJNYXJSTO4B4SKQATQSMIO6HZWORQ4NK2BUXO3CWCBKF7P2QDQC

Dependencies

[2] 7OT7JKL3FXNTJ5K4KYUFYEKR7CZZ45HHKNUCGFK7WYLR75SEGRHAC

In channels

main

Change contents

File deletion: history.rs

BF:BFD[2.15] → [2.6707:6741]

BF:BFD[2.6741] → [2.6742:6742]

B:BD[2.6742] → [2.6743:7469]

use tokio::sync::broadcast;
use crate::error::Error;
#[derive(Debug)]
pub struct History {
    hist: broadcast::Sender<Entry>,
}
impl Default for History {
    fn default() -> Self {
        Self {
            hist: broadcast::channel(8).0,
        }
    }
}
impl History {
    pub fn push(&self, entry: Entry) {
        let _ = self.hist.send(entry);
    }
    pub fn subscribe(&self) -> Reader {
        Reader(self.hist.subscribe())
    }
}
pub struct Reader(broadcast::Receiver<Entry>);
impl Reader {
    pub async fn recv(&mut self) -> Result<Entry, broadcast::error::RecvError> {
        self.0.recv().await
    }
}
#[derive(Debug, Clone)]
pub enum Entry {
    Read { addr: u16, size: u16 },
    Error(Error),
}

Insertion in src/out.rs at line 31 [2.48]

[2.616]

    pub fn check_finish(&self) -> Result<(), Error> {
        if self.out.len() != self.write_idx {
            return Err(Error::PartialWrite {
                wrote: self.write_idx as u16,
                expected: self.out.len() as u16,
            });
        }
        Ok(())
    }

Deletion in src/main.rs at line 3 [2.2202]

B:BD[2.2267] → [2.2267:2346]


use std::{
    collections::BTreeMap,
    future,
    sync::{Arc, RwLock},
};

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

B:BD[2.2368] → [2.2368:2445]

use curve_generator::{Context, List, Noise, Register, Remap, Static, Value};

[2.2368]

[2.2445]

use server::Server;

Replacement in src/main.rs at line 7 [2.2202]

B:BD[2.2446] → [2.2446:2545]

use error::Error;
use tokio_modbus::{
    prelude::Response,
    server::{NewService, Service},
};

[2.2446]

[2.2545]

mod client;
mod error;
mod server;

Deletion in src/main.rs at line 11 [2.2202]

B:BD[2.2546] → [2.2546:2676]

#[derive(Default)]
struct Server {
    config: RwLock<ServerConfig>,
    history: History,
}
mod history;
use history::History;

Deletion in src/main.rs at line 13 [2.2202]

B:BD[2.2714] → [2.2714:3524]


mod error;
#[derive(Default)]
struct ServerConfig {
    slots: BTreeMap<u16, curve_generator::RegisterType>,
}
#[derive(Clone)]
struct Client(Arc<Server>);
impl Default for Client {
    fn default() -> Self {
        Self(Default::default())
    }
}
impl NewService for Client {
    type Request = tokio_modbus::prelude::Request;
    type Response = tokio_modbus::prelude::Response;
    type Error = std::io::Error;
    type Instance = Self;
    fn new_service(&self) -> std::io::Result<Self::Instance> {
        println!("New !");
        Ok(self.clone())
    }
}
impl Service for Client {
    type Request = tokio_modbus::prelude::Request;
    type Response = tokio_modbus::prelude::Response;
    type Error = std::io::Error;
    type Future = std::future::Ready<Result<Self::Response, Self::Error>>;

Deletion in src/main.rs at line 14 [2.2202]

B:BD[2.3525] → [2.3525:5134]

    fn call(&self, req: Self::Request) -> Self::Future {
        future::ready(Ok(self.call(req)))
    }
}
impl Client {
    fn call(&self, req: tokio_modbus::prelude::Request) -> tokio_modbus::prelude::Response {
        match req {
            tokio_modbus::prelude::Request::ReadInputRegisters(addr, size) => {
                Response::ReadInputRegisters(self.get_regs(addr, size))
            }
            tokio_modbus::prelude::Request::ReadHoldingRegisters(addr, size) => {
                Response::ReadHoldingRegisters(self.get_regs(addr, size))
            }
            _ => unimplemented!(),
        }
    }
    fn get_regs(&self, addr: u16, size: u16) -> Vec<u16> {
        let time = std::time::SystemTime::now()
            .duration_since(std::time::UNIX_EPOCH)
            .unwrap()
            .as_secs_f64();
        self.0.history.push(history::Entry::Read { addr, size });
        let config = self.0.config.read().unwrap();
        let mut out = Out::new(addr, size);
        while let Some(addr) = out.next_addr() {
            let val = config.slots.get(&addr).map_or_else(
                || {
                    self.report_error(Error::UnconfiguredAddr { addr });
                    Value::default()
                },
                |r| r.read(&Context { time, reg_id: addr }),
            );
            if let Err(err) = out.write(val) {
                self.report_error(err)
            }
        }
        out.finish()
    }
    fn report_error(&self, err: Error) {
        println!("[ERROR] {err}");
        self.0.history.push(history::Entry::Error(err));
    }
}

Deletion in src/main.rs at line 16 [2.2202]
B:BD[2.5229] → [2.5229:5260]
```
    let c = Client::default();
```

Replacement in src/main.rs at line 17 [2.2202]

B:BD[2.5261] → [2.5261:6673]

    {
        let mut w = c.0.config.write().unwrap();
        w.slots.insert(25, Static(Value::I16(25)).into());
        w.slots.insert(32, Static(Value::I32(424242)).into());
        w.slots.insert(42, Static(Value::Float(42.42)).into());
        w.slots.insert(
            88,
            List(vec![
                (
                    (1.0).into(),
                    Remap(
                        Box::new(
                            Noise {
                                noise: noise::OpenSimplex::new(),
                                pos: 0.0,
                                scale: 0.5,
                            }
                            .into(),
                        ),
                        Value::Float(35.0)..Value::Float(42.0),
                    )
                    .into(),
                ),
                (
                    (1.0).into(),
                    Remap(
                        Box::new(
                            Noise {
                                noise: noise::OpenSimplex::new(),
                                pos: 82.0,
                                scale: 0.01,
                            }
                            .into(),
                        ),
                        Value::Float(-50.0)..Value::Float(50.0),
                    )
                    .into(),
                ),
            ])
            .into(),
        );

[2.5261]

[2.6673]

    let srv = Server::default();
    if let Err(err) = srv.load(include_str!("../conf.ron")) {
        println!("[ERROR] Failed to load config: {err}.\nDefault no register")

Replacement in src/main.rs at line 22 [2.2202]
B:BD[2.6680] → [2.6680:6704]
```
    s.serve_forever(c);
```
[2.6680]
[2.6704]
```
    s.serve_forever(srv);
```

Insertion in src/error.rs at line 9 [2.7503]

[2.7771]

    #[error("Partial write. Wrote {wrote} but expected to write {expected}")]
    PartialWrite { wrote: u16, expected: u16 },

Insertion in src/curve_generator.rs at line 5 [2.7817]
[2.7909]
[2.7909]
```
use serde::{Deserialize, Serialize};
```

Replacement in src/curve_generator.rs at line 60 [2.7817]

B:BD[2.9345] → [2.9345:9376]

        #[derive(Clone, Copy)]

[2.9345]

[2.9376]

        #[derive(Debug, Clone, Copy, Serialize, Deserialize)]

Replacement in src/curve_generator.rs at line 65 [2.7817]

B:BD[2.9434] → [2.9434:9465]

        #[derive(Clone, Copy)]

[2.9434]

[2.9465]

        #[derive(Debug, Clone, Copy, Serialize, Deserialize)]

Insertion in src/curve_generator.rs at line 125 [2.7817]
[2.10977]
[2.10977]
```
#[derive(Debug, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 128 [2.7817]
B:BD[2.11028] → [2.11028:11061]
```
    Zero,
    Static,
    Noise,
```
[2.11028]
[2.11061]
```
    Zero(Zero),
    Static(Static),
    Noise(Noise),
```
Replacement in src/curve_generator.rs at line 133 [2.7817]
B:BD[2.11077] → [2.11077:11089]
```
    PortId,
```
[2.11077]
[2.11089]
```
    PortId(PortId),
```
Replacement in src/curve_generator.rs at line 136 [2.7817]
B:BD[2.11102] → [2.11102:11133]
```
    Cast,
    Remap,
    List,
```
[2.11102]
[2.11133]
```
    Cast(Cast),
    Remap(Remap),
    List(List),
```
Insertion in src/curve_generator.rs at line 147 [2.7817]
[2.11229]
[2.11229]
```
#[derive(Debug, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 155 [2.7817]
B:BD[2.11348] → [2.11348:11378]
```
pub struct Static(pub Value);
```
[2.11348]
[2.11378]
```
#[derive(Debug, Serialize, Deserialize)]
pub struct Static(Value);
```
Insertion in src/curve_generator.rs at line 163 [2.7817]
[2.11480]
[2.11480]
```
#[derive(Debug, Serialize, Deserialize)]
```
Insertion in src/curve_generator.rs at line 165 [2.7817]
[2.11499]
[2.11499]
```
    #[serde(skip)]
```
Insertion in src/curve_generator.rs at line 182 [2.7817]
[2.11847]
[2.11847]
```
#[derive(Debug, Serialize, Deserialize)]
```
Insertion in src/curve_generator.rs at line 194 [2.7817]
[2.12098]
[2.12098]
```
#[derive(Debug, Serialize, Deserialize)]
```
Insertion in src/curve_generator.rs at line 206 [2.7817]
[2.12375]
[2.12375]
```
#[derive(Debug, Serialize, Deserialize)]
```
Replacement in src/curve_generator.rs at line 218 [2.7817]
B:BD[2.12649] → [2.12649:12678]
```
pub struct PortId(pub Type);
```
[2.12649]
[2.12678]
```
#[derive(Debug, Serialize, Deserialize)]
pub struct PortId;
```
Replacement in src/curve_generator.rs at line 222 [2.7817]
B:BD[2.12750] → [2.12750:12794]
```
        Value::U16(ctx.reg_id).cast(self.0)
```
[2.12750]
[2.12794]
```
        Value::U16(ctx.reg_id)
```

Insertion in Cargo.toml at line 11 [2.12838]

[2.13097]

ron = "0.7.0"
serde = { version = "1.0.135", features = ["derive"] }

Insertion in Cargo.lock at line 51 [2.13289]

[2.14564]


[[package]]
name = "base64"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

Insertion in Cargo.lock at line 322 [2.13289]
[2.21263]
[2.21263]
```
 "ron",
 "serde",
```

Insertion in Cargo.lock at line 526 [2.13289]

[2.26198]


[[package]]
name = "ron"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678"
dependencies = [
 "base64",
 "bitflags",
 "serde",
]

Insertion in Cargo.lock at line 545 [2.13289]

[2.26405]

name = "serde"
version = "1.0.135"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b"
dependencies = [
 "serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.135"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]
[[package]]

Refacto before integrating web server

Dependencies

In channels

Change contents

File deletion: history.rs

Insertion in src/out.rs at line 31 [2.48]

Deletion in src/main.rs at line 3 [2.2202]

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

Replacement in src/main.rs at line 7 [2.2202]

Deletion in src/main.rs at line 11 [2.2202]

Deletion in src/main.rs at line 13 [2.2202]

Deletion in src/main.rs at line 14 [2.2202]

Deletion in src/main.rs at line 16 [2.2202]

Replacement in src/main.rs at line 17 [2.2202]

Replacement in src/main.rs at line 22 [2.2202]

Insertion in src/error.rs at line 9 [2.7503]

Insertion in src/curve_generator.rs at line 5 [2.7817]

Replacement in src/curve_generator.rs at line 60 [2.7817]

Replacement in src/curve_generator.rs at line 65 [2.7817]

Insertion in src/curve_generator.rs at line 125 [2.7817]

Replacement in src/curve_generator.rs at line 128 [2.7817]

Replacement in src/curve_generator.rs at line 133 [2.7817]

Replacement in src/curve_generator.rs at line 136 [2.7817]

Insertion in src/curve_generator.rs at line 147 [2.7817]

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

Insertion in src/curve_generator.rs at line 163 [2.7817]

Insertion in src/curve_generator.rs at line 165 [2.7817]

Insertion in src/curve_generator.rs at line 182 [2.7817]

Insertion in src/curve_generator.rs at line 194 [2.7817]

Insertion in src/curve_generator.rs at line 206 [2.7817]

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

Replacement in src/curve_generator.rs at line 222 [2.7817]

Insertion in Cargo.toml at line 11 [2.12838]

Insertion in Cargo.lock at line 51 [2.13289]

Insertion in Cargo.lock at line 322 [2.13289]

Insertion in Cargo.lock at line 526 [2.13289]

Insertion in Cargo.lock at line 545 [2.13289]