Compare commits

...

49 commits

Author SHA1 Message Date
26084bfdf2 Update Rust crate num-traits to 0.2.18
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 9m4s
2024-02-08 02:02:28 +00:00
3b3869fff1 Merge pull request 'Update Rust crate tokio to 1.36.0' (#27) from renovate/tokio-1.x into master
Reviewed-on: #27
2024-02-07 12:03:51 +00:00
5dff8f562e Merge pull request 'Update Rust crate num-derive to 0.4.2' (#26) from renovate/num-derive-0.x into master
Reviewed-on: #26
2024-02-07 12:03:41 +00:00
e6a098417d Update Rust crate tokio to 1.36.0
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m35s
2024-02-07 02:03:15 +00:00
96e5185f68 Update Rust crate num-derive to 0.4.2
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m38s
2024-02-07 02:03:07 +00:00
b0830f60e8 Merge pull request 'Update Rust crate reqwest to 0.11.24' (#25) from renovate/reqwest-0.x into master
Reviewed-on: #25
2024-02-05 09:24:11 +00:00
abf269f601 Update Rust crate reqwest to 0.11.24
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m11s
2024-02-02 08:41:40 +00:00
bb2865bbe5 Merge pull request 'Update Rust crate chrono to 0.4.33' (#23) from renovate/chrono-0.x into master
Reviewed-on: #23
2024-02-01 08:14:27 +01:00
8506c1a21a Merge pull request 'Update Rust crate serde_json to 1.0.113' (#24) from renovate/serde_json-1.x into master
Reviewed-on: #24
2024-02-01 08:08:49 +01:00
a5d608b925 Update Rust crate serde_json to 1.0.113
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 9m11s
2024-02-01 02:04:37 +01:00
9af44d3f2a Update Rust crate chrono to 0.4.33
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m54s
2024-01-26 02:03:21 +01:00
10e212705a Merge pull request 'Update Rust crate futures to 0.3.30' (#18) from renovate/rust-futures-monorepo into master
Reviewed-on: #18
2024-01-16 07:44:33 +01:00
737a355c72 Merge pull request 'Update Rust crate base64 to 0.21.7' (#22) from renovate/base64-0.x into master
Reviewed-on: #22
2024-01-16 07:44:14 +01:00
d0eb110037 Merge pull request 'Update Rust crate reqwest to 0.11.23' (#15) from renovate/reqwest-0.x into master
Reviewed-on: #15
2024-01-15 13:19:15 +01:00
4ce8592179 Merge branch 'master' into renovate/base64-0.x
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 7m54s
2024-01-15 13:07:03 +01:00
ddb5989ad1 Merge branch 'master' into renovate/rust-futures-monorepo
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m27s
2024-01-15 13:06:29 +01:00
10f26161ed Merge branch 'master' into renovate/reqwest-0.x
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m0s
2024-01-15 13:06:05 +01:00
47537111fc Fix static warnings 2024-01-15 12:59:56 +01:00
59d5053b55 Update Rust crate reqwest to 0.11.23
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m42s
2024-01-12 02:06:18 +01:00
12835c6615 Update Rust crate futures to 0.3.30
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m47s
2024-01-12 02:06:13 +01:00
a07de828fa Update Rust crate base64 to 0.21.7
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m1s
2024-01-12 02:05:58 +01:00
81ee06be1c Merge pull request 'Update Rust crate tokio to 1.35.1' (#16) from renovate/tokio-1.x into master
Reviewed-on: #16
2024-01-11 11:28:52 +01:00
9e380f7fae Merge pull request 'Update Rust crate anyhow to 1.0.79' (#17) from renovate/anyhow-1.x into master
Reviewed-on: #17
2024-01-11 11:28:40 +01:00
84c90f0abf Merge pull request 'Update Rust crate serial_test to v3' (#20) from renovate/serial_test-3.x into master
Reviewed-on: #20
2024-01-11 11:27:53 +01:00
0bd60bc277 Merge pull request 'Update Rust crate base64 to 0.21.6' (#21) from renovate/base64-0.x into master
Reviewed-on: #21
2024-01-11 11:27:35 +01:00
b157de6881 Merge pull request 'Update Rust crate serde_json to 1.0.111' (#19) from renovate/serde_json-1.x into master
Reviewed-on: #19
2024-01-11 11:26:16 +01:00
ea4fbb3512 Update Rust crate base64 to 0.21.6
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m35s
2024-01-09 02:03:12 +01:00
1b47274b89 Update Rust crate serial_test to v3
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m36s
2024-01-07 02:03:53 +01:00
d064a2e1ee Update Rust crate serde_json to 1.0.111
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m17s
2024-01-05 02:03:14 +01:00
8b6b896297 Update Rust crate anyhow to 1.0.79
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m24s
2024-01-04 02:04:24 +01:00
ceb896cece Update Rust crate tokio to 1.35.1
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m24s
2023-12-20 02:02:41 +01:00
8c37a4cc8f Merge pull request 'Update Rust crate tokio to 1.35.0' (#14) from renovate/tokio-1.x into master
Reviewed-on: #14
2023-12-13 18:09:09 +01:00
0d6e62d4e5 Update Rust crate tokio to 1.35.0
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m30s
2023-12-09 02:02:36 +01:00
68b5891f43 Merge pull request 'Update Rust crate if-addrs to 0.11.0' (#13) from renovate/if-addrs-0.x into master
Reviewed-on: #13
2023-12-07 11:12:08 +01:00
ff1888538d Update Rust crate if-addrs to 0.11.0
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 8m46s
2023-12-06 02:02:52 +01:00
c5eb1b5eff Merge pull request 'Update Rust crate tokio to 1.34.0' (#12) from renovate/tokio-1.x into master
Reviewed-on: #12
2023-11-11 08:26:02 +01:00
405b750482 Update Rust crate tokio to 1.34.0
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 11m30s
2023-11-10 02:02:34 +01:00
e9df623c3b Merge pull request 'Update Rust crate serde_json to 1.0.108' (#11) from renovate/serde_json-1.x into master
Reviewed-on: #11
2023-10-31 11:18:00 +01:00
6dab56ba02 Update Rust crate serde_json to 1.0.108
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 11m58s
2023-10-31 02:02:25 +01:00
9a2df58f5c Merge pull request 'Update Rust crate futures to 0.3.29' (#10) from renovate/rust-futures-monorepo into master
Reviewed-on: #10
2023-10-27 08:02:54 +02:00
33ea4ab4b6 Update Rust crate futures to 0.3.29
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 11m44s
2023-10-27 02:02:45 +02:00
88d511daa3 Merge pull request 'Update Rust crate base64 to 0.21.5' (#9) from renovate/base64-0.x into master
Reviewed-on: #9
2023-10-25 07:46:20 +02:00
14a6cd23c6 Update Rust crate base64 to 0.21.5
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 11m46s
2023-10-24 02:02:40 +02:00
f7709686e1 Merge pull request 'Update Rust crate num-derive to 0.4.1' (#7) from renovate/num-derive-0.x into master
Reviewed-on: #7
2023-10-10 06:26:20 +02:00
b824f76995 Merge pull request 'Update Rust crate tokio to 1.33.0' (#8) from renovate/tokio-1.x into master
Reviewed-on: #8
2023-10-10 06:26:09 +02:00
3db9029d00 Update Rust crate tokio to 1.33.0
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 11m46s
2023-10-10 02:02:25 +02:00
3f595f5c3b Update Rust crate num-derive to 0.4.1
All checks were successful
Midea Merge / Serial Reader (pull_request) Successful in 11m19s
2023-10-10 02:02:22 +02:00
8ea4fc1aef Fix release build 2023-10-09 20:40:05 +02:00
f8fa859c29 Merge pull request 'Update Rust crate num-traits to 0.2.17' (#3) from renovate/num-traits-0.x into master
Reviewed-on: #3
2023-10-09 11:21:41 +02:00
5 changed files with 28 additions and 20 deletions

View file

@ -6,23 +6,23 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = { version = "1.0.75", features = ["backtrace"] }
if-addrs = "0.10.2"
anyhow = { version = "1.0.79", features = ["backtrace"] }
if-addrs = "0.11.0"
rand = "0.8.5"
chrono = "0.4.31"
chrono = "0.4.33"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.107"
reqwest = "0.11.22"
tokio = { version = "1.32.0", features=["macros", "rt-multi-thread"] }
futures = "0.3.28"
serial_test = "2.0.0"
num-traits = "0.2.17"
num-derive = "0.4.0"
serde_json = "1.0.113"
reqwest = "0.11.24"
tokio = { version = "1.36.0", features=["macros", "rt-multi-thread"] }
futures = "0.3.30"
serial_test = "3.0.0"
num-traits = "0.2.18"
num-derive = "0.4.2"
#crypto
cbc = { version = "0.1.2", features = ["alloc"] }
md5 = "0.7.0"
base64 = "0.21.4"
base64 = "0.21.7"
hmac = "0.12.1"
sha2 = "0.10.8"
aes = "0.8.3"

View file

@ -40,13 +40,13 @@ struct Input {
}
impl Cloud {
pub const APP_ID: &str = "1010";
pub const APP_KEY: &str = "ac21b9f9cbfe4ca5a88562ef25e2b768";
pub const API_URL: &str = "https://mp-prod.appsmb.com/mas/v5/app/proxy?alias=";
pub const APP_VERSION: &str = "3.0.2";
pub const SRC: &str = "10";
pub const IOT_KEY: &str = "meicloud";
pub const HMAC_KEY: &str = "PROD_VnoClJI9aikS8dyy";
pub const APP_ID: &'static str = "1010";
pub const APP_KEY: &'static str = "ac21b9f9cbfe4ca5a88562ef25e2b768";
pub const API_URL: &'static str = "https://mp-prod.appsmb.com/mas/v5/app/proxy?alias=";
pub const APP_VERSION: &'static str = "3.0.2";
pub const SRC: &'static str = "10";
pub const IOT_KEY: &'static str = "meicloud";
pub const HMAC_KEY: &'static str = "PROD_VnoClJI9aikS8dyy";
pub fn new(account: impl ToString, password: impl ToString) -> Result<Self> {
let account = account.to_string();

View file

@ -39,6 +39,7 @@ impl CommandRequest {
body,
},
#[cfg(debug_assertions)]
name,
}
}

View file

@ -148,7 +148,14 @@ impl CommandE1Base {
#[cfg(debug_assertions)] name: &'static str,
) -> Self {
Self {
command: CommandRequest::new(device_protocol_version, 0xE1, message_type, body, name),
command: CommandRequest::new(
device_protocol_version,
0xE1,
message_type,
body,
#[cfg(debug_assertions)]
name,
),
}
}
}

View file

@ -34,7 +34,7 @@ impl Security {
const N: u128 = 141661095494369103254425781617665632877;
const KEY: [u8; 16] = Self::N.to_be_bytes();
const IV: [u8; 16] = [b'\0'; 16];
const SALT: &[u8] = b"xhdiwjnchekd4d512chdjx5d8e4c394D2D7S";
const SALT: &'static [u8] = b"xhdiwjnchekd4d512chdjx5d8e4c394D2D7S";
pub fn encode32_data(data: &[u8]) -> Vec<u8> {
md5::compute([data, Self::SALT].concat()).to_vec()