- fixed panic when calling IotHubClient::from_identity_service

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.3] Q3 2022
+ - fixed panic when calling IotHubClient::from_identity_service
+ - fixed terminating on ExpiredSasToken
+ - bumped to latest azure-iot-sdk 0.8.3
+
 ## [0.4.2] Q3 2022
  - bump to azure-iot-sdk 0.8.2
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iot-client-template-rs"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2021"
 authors = ["Joerg Zeidler <joerg.zeidler@conplement.de>", "Jan Zachmann <jan.zachmann@conplement.de>"]
 repository = "git@github.com:ICS-DeviceManagement/iot-client-template-rs.git"
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 # use either device_client, module_client or edge_client
-azure-iot-sdk = { git = "ssh://git@github.com/ICS-DeviceManagement/azure-iot-sdk.git", tag = "0.8.2", default-features = false }
+azure-iot-sdk = { git = "ssh://git@github.com/ICS-DeviceManagement/azure-iot-sdk.git", tag = "0.8.3", default-features = false }
 sd-notify = { git = "ssh://git@github.com/ICS-DeviceManagement/sd-notify.git", tag = "v0.5.0", optional = true }
 serde_json = "1.0"
 env_logger = "0.8"

src/client.rs

@@ -1,8 +1,8 @@
 use azure_iot_sdk::client::*;
 use log::debug;
 use std::sync::{mpsc::Receiver, mpsc::Sender, Arc, Mutex};
-use tokio::task::JoinHandle;
 use std::time;
+use tokio::task::JoinHandle;
 
 #[cfg(feature = "systemd")]
 use crate::systemd::WatchdogHandler;
@@ -81,7 +81,7 @@ impl Client {
 
         let running = Arc::clone(&self.run);
 
-        self.thread = Some(tokio::spawn(async move {
+        self.thread = Some(tokio::task::spawn_blocking(move || {
             let hundred_millis = time::Duration::from_millis(100);
             let event_handler = ClientEventHandler { direct_methods, tx };
 
@@ -92,10 +92,9 @@ impl Client {
             wdt.init()?;
 
             let mut client = match IotHubClient::get_client_type() {
-                _ if connection_string.is_some() => IotHubClient::from_connection_string(
-                    connection_string.unwrap(),
-                    event_handler,
-                )?,
+                _ if connection_string.is_some() => {
+                    IotHubClient::from_connection_string(connection_string.unwrap(), event_handler)?
+                }
                 ClientType::Device | ClientType::Module => {
                     IotHubClient::from_identity_service(event_handler)?
                 }

src/lib.rs

@@ -7,8 +7,12 @@ pub mod twin;
 use azure_iot_sdk::client::*;
 use client::{Client, Message};
 use log::{debug, error};
+use std::matches;
+use std::sync::Once;
 use std::sync::{mpsc, Arc, Mutex};
 
+static INIT: Once = Once::new();
+
 #[tokio::main]
 pub async fn run() -> Result<(), IotError> {
     let mut client = Client::new();
@@ -22,19 +26,23 @@ pub async fn run() -> Result<(), IotError> {
     for msg in rx_client2app {
         match msg {
             Message::Authenticated => {
-                #[cfg(feature = "systemd")]
-                systemd::notify_ready();
+                INIT.call_once(|| {
+                    #[cfg(feature = "systemd")]
+                    systemd::notify_ready();
 
-                if let Err(e) = twin::report_version(Arc::clone(&tx_app2client)) {
-                    error!("Couldn't report version: {}", e);
-                }
+                    if let Err(e) = twin::report_version(Arc::clone(&tx_app2client)) {
+                        error!("Couldn't report version: {}", e);
+                    }
+                });
             }
             Message::Unauthenticated(reason) => {
-                client.stop().await.unwrap();
-                return Err(IotError::from(format!(
-                    "No connection. Reason: {:?}",
-                    reason
-                )));
+                if !matches!(reason, UnauthenticatedReason::ExpiredSasToken) {
+                    client.stop().await.unwrap();
+                    return Err(IotError::from(format!(
+                        "No connection. Reason: {:?}",
+                        reason
+                    )));
+                }
             }
             Message::Desired(state, desired) => {
                 twin::update(state, desired, Arc::clone(&tx_app2client));