projects
/
minecraft_web.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c849abb
)
Display the minecraft server version
author
Greg Burri
<greg.burri@gmail.com>
Thu, 5 May 2022 22:03:26 +0000
(
00:03
+0200)
committer
Greg Burri
<greg.burri@gmail.com>
Thu, 5 May 2022 22:03:26 +0000
(
00:03
+0200)
Cargo.lock
patch
|
blob
|
history
backend/Cargo.toml
patch
|
blob
|
history
backend/src/main.rs
patch
|
blob
|
history
backend/src/minecraft_controller.rs
patch
|
blob
|
history
backend/templates/main.html
patch
|
blob
|
history
common/Cargo.toml
patch
|
blob
|
history
diff --git
a/Cargo.lock
b/Cargo.lock
index
22af4e7
..
81f4413
100644
(file)
--- a/
Cargo.lock
+++ b/
Cargo.lock
@@
-395,7
+395,7
@@
dependencies = [
"cached_proc_macro",
"cached_proc_macro_types",
"futures",
"cached_proc_macro",
"cached_proc_macro_types",
"futures",
- "hashbrown 0.12.
0
",
+ "hashbrown 0.12.
1
",
"lazy_static",
"once_cell",
"thiserror",
"lazy_static",
"once_cell",
"thiserror",
@@
-629,9
+629,9
@@
checksum = "4d3d6188b8804df28032815ea256b6955c9625c24da7525f387a7af02fbb8f01"
[[package]]
name = "flate2"
[[package]]
name = "flate2"
-version = "1.0.2
2
"
+version = "1.0.2
3
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53
f"
+checksum = "
b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09a
f"
dependencies = [
"cfg-if",
"crc32fast",
dependencies = [
"cfg-if",
"crc32fast",
@@
-798,9
+798,9
@@
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
[[package]]
name = "hashbrown"
[[package]]
name = "hashbrown"
-version = "0.12.
0
"
+version = "0.12.
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758
"
+checksum = "
db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3
"
[[package]]
name = "hermit-abi"
[[package]]
name = "hermit-abi"
@@
-813,9
+813,9
@@
dependencies = [
[[package]]
name = "http"
[[package]]
name = "http"
-version = "0.2.
6
"
+version = "0.2.
7
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03
"
+checksum = "
ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb
"
dependencies = [
"bytes",
"fnv",
dependencies = [
"bytes",
"fnv",
@@
-830,9
+830,9
@@
checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
[[package]]
name = "httparse"
[[package]]
name = "httparse"
-version = "1.
6.0
"
+version = "1.
7.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4
"
+checksum = "
496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c
"
[[package]]
name = "httpdate"
[[package]]
name = "httpdate"
@@
-911,15
+911,15
@@
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
[[package]]
name = "libc"
-version = "0.2.12
2
"
+version = "0.2.12
5
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259
"
+checksum = "
5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b
"
[[package]]
name = "local-channel"
[[package]]
name = "local-channel"
-version = "0.1.
2
"
+version = "0.1.
3
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
6246c68cf195087205a0512559c97e15eaf95198bf0e206d662092cdcb03fe9f
"
+checksum = "
7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c
"
dependencies = [
"futures-core",
"futures-sink",
dependencies = [
"futures-core",
"futures-sink",
@@
-929,9
+929,9
@@
dependencies = [
[[package]]
name = "local-waker"
[[package]]
name = "local-waker"
-version = "0.1.
2
"
+version = "0.1.
3
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
902eb695eb0591864543cbfbf6d742510642a605a61fc5e97fe6ceb5a30ac4fb
"
+checksum = "
e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1
"
[[package]]
name = "lock_api"
[[package]]
name = "lock_api"
@@
-945,9
+945,9
@@
dependencies = [
[[package]]
name = "log"
[[package]]
name = "log"
-version = "0.4.1
6
"
+version = "0.4.1
7
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8
"
+checksum = "
abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
"
dependencies = [
"cfg-if",
]
dependencies = [
"cfg-if",
]
@@
-960,9
+960,9
@@
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]]
name = "memchr"
[[package]]
name = "memchr"
-version = "2.
4.1
"
+version = "2.
5.0
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
"
+checksum = "
2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
"
[[package]]
name = "memoffset"
[[package]]
name = "memoffset"
@@
-1023,12
+1023,11
@@
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
[[package]]
name = "miniz_oxide"
-version = "0.
4.4
"
+version = "0.
5.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b
"
+checksum = "
d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082
"
dependencies = [
"adler",
dependencies = [
"adler",
- "autocfg",
]
[[package]]
]
[[package]]
@@
-1075,9
+1074,9
@@
dependencies = [
[[package]]
name = "num-integer"
[[package]]
name = "num-integer"
-version = "0.1.4
4
"
+version = "0.1.4
5
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
"
+checksum = "
225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
"
dependencies = [
"autocfg",
"num-traits",
dependencies = [
"autocfg",
"num-traits",
@@
-1085,9
+1084,9
@@
dependencies = [
[[package]]
name = "num-traits"
[[package]]
name = "num-traits"
-version = "0.2.1
4
"
+version = "0.2.1
5
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
"
+checksum = "
578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
"
dependencies = [
"autocfg",
]
dependencies = [
"autocfg",
]
@@
-1104,9
+1103,9
@@
dependencies = [
[[package]]
name = "num_threads"
[[package]]
name = "num_threads"
-version = "0.1.
5
"
+version = "0.1.
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0
"
+checksum = "
2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44
"
dependencies = [
"libc",
]
dependencies = [
"libc",
]
@@
-1129,9
+1128,9
@@
dependencies = [
[[package]]
name = "parking_lot_core"
[[package]]
name = "parking_lot_core"
-version = "0.9.
2
"
+version = "0.9.
3
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37
"
+checksum = "
09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929
"
dependencies = [
"cfg-if",
"libc",
dependencies = [
"cfg-if",
"libc",
@@
-1154,9
+1153,9
@@
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pin-project-lite"
[[package]]
name = "pin-project-lite"
-version = "0.2.
8
"
+version = "0.2.
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e
280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c
"
+checksum = "e
0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116
"
[[package]]
name = "pin-utils"
[[package]]
name = "pin-utils"
@@
-1181,9
+1180,9
@@
dependencies = [
[[package]]
name = "quote"
[[package]]
name = "quote"
-version = "1.0.1
7
"
+version = "1.0.1
8
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58
"
+checksum = "
a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1
"
dependencies = [
"proc-macro2",
]
dependencies = [
"proc-macro2",
]
@@
-1220,9
+1219,9
@@
dependencies = [
[[package]]
name = "rayon"
[[package]]
name = "rayon"
-version = "1.5.
1
"
+version = "1.5.
2
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90
"
+checksum = "
fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221
"
dependencies = [
"autocfg",
"crossbeam-deque",
dependencies = [
"autocfg",
"crossbeam-deque",
@@
-1232,14
+1231,13
@@
dependencies = [
[[package]]
name = "rayon-core"
[[package]]
name = "rayon-core"
-version = "1.9.
1
"
+version = "1.9.
2
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e
"
+checksum = "
9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4
"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
- "lazy_static",
"num_cpus",
]
"num_cpus",
]
@@
-1303,24
+1301,24
@@
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "semver"
[[package]]
name = "semver"
-version = "1.0.
7
"
+version = "1.0.
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4
"
+checksum = "
8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd
"
[[package]]
name = "serde"
[[package]]
name = "serde"
-version = "1.0.13
6
"
+version = "1.0.13
7
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789
"
+checksum = "
61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1
"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.13
6
"
+version = "1.0.13
7
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9
"
+checksum = "
1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be
"
dependencies = [
"proc-macro2",
"quote",
dependencies = [
"proc-macro2",
"quote",
@@
-1329,9
+1327,9
@@
dependencies = [
[[package]]
name = "serde_json"
[[package]]
name = "serde_json"
-version = "1.0.
79
"
+version = "1.0.
81
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95
"
+checksum = "
9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c
"
dependencies = [
"itoa",
"ryu",
dependencies = [
"itoa",
"ryu",
@@
-1400,9
+1398,9
@@
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
[[package]]
name = "syn"
-version = "1.0.9
1
"
+version = "1.0.9
2
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d
"
+checksum = "
7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52
"
dependencies = [
"proc-macro2",
"quote",
dependencies = [
"proc-macro2",
"quote",
@@
-1411,9
+1409,9
@@
dependencies = [
[[package]]
name = "sysinfo"
[[package]]
name = "sysinfo"
-version = "0.23.
8
"
+version = "0.23.
11
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
ad04c584871b8dceb769a20b94e26a357a870c999b7246dcd4cb233d927547e3
"
+checksum = "
3bf915673a340ee41f2fc24ad1286c75ea92026f04b65a0d0e5132d80b95fc61
"
dependencies = [
"cfg-if",
"core-foundation-sys",
dependencies = [
"cfg-if",
"core-foundation-sys",
@@
-1426,18
+1424,18
@@
dependencies = [
[[package]]
name = "thiserror"
[[package]]
name = "thiserror"
-version = "1.0.3
0
"
+version = "1.0.3
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417
"
+checksum = "
bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a
"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.3
0
"
+version = "1.0.3
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b
"
+checksum = "
0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a
"
dependencies = [
"proc-macro2",
"quote",
dependencies = [
"proc-macro2",
"quote",
@@
-1474,9
+1472,9
@@
checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
[[package]]
name = "tinyvec"
[[package]]
name = "tinyvec"
-version = "1.
5.1
"
+version = "1.
6.0
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2
"
+checksum = "
87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
"
dependencies = [
"tinyvec_macros",
]
dependencies = [
"tinyvec_macros",
]
@@
-1489,9
+1487,9
@@
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
[[package]]
name = "tokio"
-version = "1.1
7.0
"
+version = "1.1
8.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee
"
+checksum = "
dce653fb475565de9f6fb0614b28bca8df2c430c0cf84bcd9c843f15de5414cc
"
dependencies = [
"bytes",
"libc",
dependencies = [
"bytes",
"libc",
@@
-1534,18
+1532,18
@@
dependencies = [
[[package]]
name = "toml"
[[package]]
name = "toml"
-version = "0.5.
8
"
+version = "0.5.
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa
"
+checksum = "
8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7
"
dependencies = [
"serde",
]
[[package]]
name = "tracing"
dependencies = [
"serde",
]
[[package]]
name = "tracing"
-version = "0.1.3
2
"
+version = "0.1.3
4
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f
"
+checksum = "
5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09
"
dependencies = [
"cfg-if",
"log",
dependencies = [
"cfg-if",
"log",
@@
-1556,9
+1554,9
@@
dependencies = [
[[package]]
name = "tracing-attributes"
[[package]]
name = "tracing-attributes"
-version = "0.1.2
0
"
+version = "0.1.2
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b
"
+checksum = "
cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c
"
dependencies = [
"proc-macro2",
"quote",
dependencies = [
"proc-macro2",
"quote",
@@
-1567,9
+1565,9
@@
dependencies = [
[[package]]
name = "tracing-core"
[[package]]
name = "tracing-core"
-version = "0.1.2
4
"
+version = "0.1.2
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee
"
+checksum = "
f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f
"
dependencies = [
"lazy_static",
]
dependencies = [
"lazy_static",
]
@@
-1591,9
+1589,9
@@
dependencies = [
[[package]]
name = "unicode-bidi"
[[package]]
name = "unicode-bidi"
-version = "0.3.
7
"
+version = "0.3.
8
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f
"
+checksum = "
099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992
"
[[package]]
name = "unicode-normalization"
[[package]]
name = "unicode-normalization"
@@
-1606,9
+1604,9
@@
dependencies = [
[[package]]
name = "unicode-xid"
[[package]]
name = "unicode-xid"
-version = "0.2.
2
"
+version = "0.2.
3
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
"
+checksum = "
957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04
"
[[package]]
name = "url"
[[package]]
name = "url"
@@
-1664,9
+1662,9
@@
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
[[package]]
name = "windows-sys"
-version = "0.3
4.0
"
+version = "0.3
6.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825
"
+checksum = "
ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
"
dependencies = [
"windows_aarch64_msvc",
"windows_i686_gnu",
dependencies = [
"windows_aarch64_msvc",
"windows_i686_gnu",
@@
-1677,33
+1675,33
@@
dependencies = [
[[package]]
name = "windows_aarch64_msvc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.3
4.0
"
+version = "0.3
6.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d
"
+checksum = "
9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47
"
[[package]]
name = "windows_i686_gnu"
[[package]]
name = "windows_i686_gnu"
-version = "0.3
4.0
"
+version = "0.3
6.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed
"
+checksum = "
180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6
"
[[package]]
name = "windows_i686_msvc"
[[package]]
name = "windows_i686_msvc"
-version = "0.3
4.0
"
+version = "0.3
6.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956
"
+checksum = "
e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024
"
[[package]]
name = "windows_x86_64_gnu"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.3
4.0
"
+version = "0.3
6.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4
"
+checksum = "
4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1
"
[[package]]
name = "windows_x86_64_msvc"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.3
4.0
"
+version = "0.3
6.1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "
d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9
"
+checksum = "
c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680
"
[[package]]
name = "zstd"
[[package]]
name = "zstd"
diff --git
a/backend/Cargo.toml
b/backend/Cargo.toml
index
d1296d3
..
7319302
100644
(file)
--- a/
backend/Cargo.toml
+++ b/
backend/Cargo.toml
@@
-2,7
+2,7
@@
name = "minecraft_web"
version = "1.0.0"
authors = ["Grégory Burri <greg.burri@gmail.com>"]
name = "minecraft_web"
version = "1.0.0"
authors = ["Grégory Burri <greg.burri@gmail.com>"]
-edition = "20
18
"
+edition = "20
21
"
[dependencies]
actix-web = "4"
[dependencies]
actix-web = "4"
diff --git
a/backend/src/main.rs
b/backend/src/main.rs
index
c4d7d50
..
4ce1508
100644
(file)
--- a/
backend/src/main.rs
+++ b/
backend/src/main.rs
@@
-15,6
+15,7
@@
mod minecraft_controller;
#[template(path = "main.html")]
struct MainTemplate {
text_status: String,
#[template(path = "main.html")]
struct MainTemplate {
text_status: String,
+ version: String,
memory: String,
load_average: String,
uptime: String,
memory: String,
load_average: String,
uptime: String,
@@
-38,6
+39,7
@@
async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
Some(info) =>
MainTemplate {
text_status: String::from("Minecraft server is up and running :)"),
Some(info) =>
MainTemplate {
text_status: String::from("Minecraft server is up and running :)"),
+ version: info.format_version(),
memory: info.format_memory(),
load_average: info.format_load_average(),
uptime: info.format_uptime(),
memory: info.format_memory(),
load_average: info.format_load_average(),
uptime: info.format_uptime(),
@@
-49,6
+51,7
@@
async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
let value_unknown = String::from(VALUE_UNKNOWN);
MainTemplate {
text_status: String::from("Minecraft server is down :("),
let value_unknown = String::from(VALUE_UNKNOWN);
MainTemplate {
text_status: String::from("Minecraft server is down :("),
+ version: value_unknown.clone(),
memory: value_unknown.clone(),
load_average: value_unknown.clone(),
uptime: value_unknown.clone(),
memory: value_unknown.clone(),
load_average: value_unknown.clone(),
uptime: value_unknown.clone(),
diff --git
a/backend/src/minecraft_controller.rs
b/backend/src/minecraft_controller.rs
index
54143e8
..
545e8c2
100644
(file)
--- a/
backend/src/minecraft_controller.rs
+++ b/
backend/src/minecraft_controller.rs
@@
-9,6
+9,7
@@
pub struct MinecraftExe {
uptime: u64, // [s].
\r
world_size: u64, // [B].
\r
active_players: Vec<String>,
\r
uptime: u64, // [s].
\r
world_size: u64, // [B].
\r
active_players: Vec<String>,
\r
+ version: String,
\r
last_backup: Option<SystemTime>,
\r
}
\r
\r
last_backup: Option<SystemTime>,
\r
}
\r
\r
@@
-40,6
+41,10
@@
impl MinecraftExe {
}
\r
}
\r
\r
}
\r
}
\r
\r
+ pub fn format_version(&self) -> String {
\r
+ self.version.clone()
\r
+ }
\r
+
\r
pub fn format_last_backup(&self) -> String {
\r
match self.last_backup {
\r
Some(t) => {
\r
pub fn format_last_backup(&self) -> String {
\r
match self.last_backup {
\r
Some(t) => {
\r
@@
-73,6
+78,7
@@
const MINECRAFT_PROCESS_NAME: &str = "java";
\r
struct StatusFromRcon {
\r
players: Vec<String>,
\r
\r
struct StatusFromRcon {
\r
players: Vec<String>,
\r
+ version: String,
\r
}
\r
\r
fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
\r
}
\r
\r
fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
\r
@@
-98,12
+104,20
@@
fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
println!("Error from 'list' command");
\r
Vec::new()
\r
},
\r
println!("Error from 'list' command");
\r
Vec::new()
\r
},
\r
+ },
\r
+ version:
\r
+ match client.send_command("list".to_string()) {
\r
+ Ok(resp) => resp.body,
\r
+ Err(_e) => {
\r
+ println!("Error from 'version' command");
\r
+ String::new()
\r
+ }
\r
}
\r
}
\r
},
\r
Err(_e) => {
\r
println!("Authentication error");
\r
}
\r
}
\r
},
\r
Err(_e) => {
\r
println!("Authentication error");
\r
- StatusFromRcon { players: Vec::new() }
\r
+ StatusFromRcon { players: Vec::new()
, version: String::new()
}
\r
},
\r
};
\r
\r
},
\r
};
\r
\r
@@
-145,6
+159,7
@@
pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str,
uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),
\r
world_size,
\r
active_players: status_from_rcon.players,
\r
uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),
\r
world_size,
\r
active_players: status_from_rcon.players,
\r
+ version: status_from_rcon.version,
\r
last_backup: get_last_backup_datetime(backup_path)
\r
}
\r
)
\r
last_backup: get_last_backup_datetime(backup_path)
\r
}
\r
)
\r
diff --git
a/backend/templates/main.html
b/backend/templates/main.html
index
fc2905f
..
b3903b2
100644
(file)
--- a/
backend/templates/main.html
+++ b/
backend/templates/main.html
@@
-11,6
+11,7
@@
<div class="container">
\r
<h1>{{ text_status }}</h1>
\r
<table>
\r
<div class="container">
\r
<h1>{{ text_status }}</h1>
\r
<table>
\r
+ <tr><td>Version</td><td>{{ version }}</td></tr>
\r
<tr><td>Active players</td><td>{{ active_players }}</td>
\r
<tr><td>World size</td><td>{{ world_size }}</td></tr>
\r
<tr><td>Memory used</td><td>{{ memory }}</td></tr>
\r
<tr><td>Active players</td><td>{{ active_players }}</td>
\r
<tr><td>World size</td><td>{{ world_size }}</td></tr>
\r
<tr><td>Memory used</td><td>{{ memory }}</td></tr>
\r
diff --git
a/common/Cargo.toml
b/common/Cargo.toml
index
cf6ec79
..
79f1658
100644
(file)
--- a/
common/Cargo.toml
+++ b/
common/Cargo.toml
@@
-2,7
+2,7
@@
name = "common"
version = "0.1.0"
authors = ["Grégory Burri <greg.burri@gmail.com>"]
name = "common"
version = "0.1.0"
authors = ["Grégory Burri <greg.burri@gmail.com>"]
-edition = "20
18
"
+edition = "20
21
"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]