misc: update

Author: MarcelCoding

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tlms"
-version = "0.9.0"
-edition = "2021"
+version = "0.10.0"
+edition = "2024"
 
 [features]
 
@@ -24,6 +24,7 @@ receivers = []
 
 grpc = [
     "dep:tonic",
+    "dep:tonic-prost",
     "dep:prost",
 ]
 
@@ -36,6 +37,7 @@ telegrams = [
     "dep:regex",
     "dep:struct-field-names-as-array",
     "dep:tonic",
+    "dep:tonic-prost",
     "dep:prost",
     "dep:utoipa"
 ]
@@ -57,25 +59,26 @@ statistics = [
 serde_json = "1.0"
 serde = {version = "1.0", features = ["derive"]}
 chrono = {version = "0.4", features = [ "serde" ]}
-uuid = {version = "1.2", features = ["serde", "v4"]}
-num-derive = {version = "0.3"}
+uuid = {version = "1.18", features = ["serde", "v4"]}
+num-derive = {version = "0.4"}
 
-diesel = { version = "2.0", features = ["postgres", "r2d2", "chrono", "uuid"]}
+diesel = { version = "2.3", features = ["postgres", "r2d2", "chrono", "uuid"]}
 
-tonic = {version = "0.7", optional = true}
-prost = {version = "0.10", optional = true}
+tonic = {version = "0.14", optional = true}
+tonic-prost = {version = "0.14", optional = true}
+prost = { version = "0.14", optional = true}
 
-struct-field-names-as-array = {version = "0.1", optional = true}
+struct-field-names-as-array = {version = "0.3", optional = true}
 num-traits = {version = "0.2", optional = true}
-pbkdf2 = {version = "0.11", optional = true}
-rand = {version = "0.8", optional = true}
+pbkdf2 = {version = "0.12", optional = true, features = ["simple"]}
+rand = {version = "0.9", optional = true}
 log = { version = "0.4", optional = true}
-regex = {version = "1.7", optional = true}
+regex = {version = "1.12", optional = true}
 
-reqwest = {version = "0.11", optional = true, features = ["blocking"]}
-utoipa = {version = "3", optional = true}
+reqwest = {version = "0.12", optional = true, features = ["blocking"]}
+utoipa = {version = "5", optional = true, features = [ "chrono", "uuid"]}
 
 securefmt = { version = "0.1" }
 
 [build-dependencies]
-tonic-build = "0.7"
+tonic-prost-build = "0.14"

build.rs

@@ -1,4 +1,4 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    tonic_build::compile_protos("proto/telegram.proto")?;
+    tonic_prost_build::compile_protos("proto/telegram.proto")?;
     Ok(())
 }

flake.lock

@@ -1,5 +1,5 @@
 {
-  inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; };
+  inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; };
 
   outputs = { self, nixpkgs }:
     let
@@ -67,7 +67,8 @@
       };
 
       devShells."x86_64-linux".default = pkgs.mkShell {
-        nativeBuildInputs = with pkgs; [ grpc protobuf websocketpp pkg-config postgresql_14 openssl diesel-cli ];
+        nativeBuildInputs = with pkgs; [ pkg-config protobuf ];
+        buildInputs=  with pkgs; [ openssl ];
       };
     };
 }

flake.nix

@@ -44,12 +44,12 @@ pub mod time_serializer {
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     /// this is a function that serializes NaiveDateTime as DateTime<Utc> so we also serialize
-    /// zone information as welll
+    /// zone information as well
     pub fn serialize<S>(time: &NaiveDateTime, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
-        let time = DateTime::<Utc>::from_utc(*time, Utc);
+        let time = DateTime::<Utc>::from_naive_utc_and_offset(*time, Utc);
 
         time.serialize(serializer)
     }

src/lib.rs

@@ -152,7 +152,9 @@ impl ApiTransmissionLocation {
         if let Ok(epsg_val) = serde_json::from_str(&format!("{{ \"x\":{x}, \"y\":{y} }}")) {
             self.properties["epsg3857"] = epsg_val;
         } else {
-            eprintln!("epsg3857 property update skipped: Could not serialize {x} and {y} into json Value!");
+            eprintln!(
+                "epsg3857 property update skipped: Could not serialize {x} and {y} into json Value!"
+            );
         }
     }
 }

src/locations/mod.rs

@@ -2,8 +2,8 @@ use crate::schema::*;
 
 use log::warn;
 use pbkdf2::{
-    password_hash::{Encoding, PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
     Pbkdf2,
+    password_hash::{Encoding, PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
 };
 use serde::ser::SerializeStruct;
 use serde::{Deserialize, Serialize, Serializer};
@@ -13,8 +13,8 @@ use uuid::Uuid;
 use diesel::deserialize::{self, FromSql};
 use diesel::serialize::{self, Output, ToSql};
 use diesel::{
-    pg::Pg, AsChangeset, AsExpression, ExpressionMethods, FromSqlRow, Identifiable, Insertable,
-    PgConnection, QueryDsl, Queryable, RunQueryDsl,
+    AsChangeset, AsExpression, ExpressionMethods, FromSqlRow, Identifiable, Insertable,
+    PgConnection, QueryDsl, Queryable, RunQueryDsl, pg::Pg,
 };
 use securefmt::Debug;
 use std::collections::HashMap;