stinger-ipc 0.0.26__tar.gz → 0.0.27__tar.gz

{stinger_ipc-0.0.26/stinger_ipc.egg-info → stinger_ipc-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stinger-ipc
-Version: 0.0.26
+Version: 0.0.27
 Summary: Tools to create code to do IPC over MQTT
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{stinger_ipc-0.0.26 → stinger_ipc-0.0.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stinger-ipc"
-version = "0.0.26"
+version = "0.0.27"
 description = "Tools to create code to do IPC over MQTT"
 readme = "README.md"
 requires-python = ">=3.12"

{stinger_ipc-0.0.26 → stinger_ipc-0.0.27/stinger_ipc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stinger-ipc
-Version: 0.0.26
+Version: 0.0.27
 Summary: Tools to create code to do IPC over MQTT
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{stinger_ipc-0.0.26 → stinger_ipc-0.0.27}/stingeripc/templates/rust/server/Cargo.toml.jinja2

@@ -15,6 +15,7 @@ serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
 log = "0.4"
 env_logger = "0.10"
+async-trait = "0.1"
 
 [[example]]
 name = "{{stinger.name | snake_case}}_server_demo"

{stinger_ipc-0.0.26 → stinger_ipc-0.0.27}/stingeripc/templates/rust/server/examples/server.rs.jinja2

@@ -10,9 +10,10 @@ use mqttier::MqttierClient;
 use {{stinger.rust.server_package_name}}::{ {{stinger.rust.server_struct_name}}{%if stinger.methods|length>0%}, {{stinger.name | UpperCamelCase }}MethodHandlers{%endif%} };
 use tokio::time::{sleep, Duration};
 {%if stinger.methods|length > 0%}
-//use {{stinger.rust.server_package_name}}::handler::{{stinger.name | UpperCamelCase }}MethodHandlers;
-//use {{stinger.rust.server_package_name}}::init::Initializable;
-use std::sync::{Arc, Mutex};{%endif%}
+use std::sync::Arc;
+use tokio::sync::Mutex;
+use async_trait::async_trait;
+{%endif%}
 #[allow(unused_imports)]
 use {{stinger.rust.common_package_name}}::payloads::{MethodResultCode, *};
 
@@ -29,15 +30,16 @@ impl {{stinger.name | UpperCamelCase }}MethodImpl {
     }
 }
 
+#[async_trait]
 impl {{stinger.name | UpperCamelCase }}MethodHandlers for {{stinger.name | UpperCamelCase }}MethodImpl {
 
-    fn initialize(&mut self, server: {{stinger.rust.server_struct_name}}) -> Result<(), MethodResultCode> {
+    async fn initialize(&mut self, server: {{stinger.rust.server_struct_name}}) -> Result<(), MethodResultCode> {
         self.server = Some(server.clone());
         Ok(())
     }
 
     {%for method_name, method in stinger.methods.items()%}
-    fn handle_{{method_name|snake_case}}(&self, {%for arg in method.arg_list%}_{{arg.name|snake_case}}: {{arg.rust_type}}{%if not loop.last%}, {%endif%}{%endfor%}) -> Result<{{method.return_value_rust_type}}, MethodResultCode> {
+    async fn handle_{{method_name|snake_case}}(&self, {%for arg in method.arg_list%}_{{arg.name|snake_case}}: {{arg.rust_type}}{%if not loop.last%}, {%endif%}{%endfor%}) -> Result<{{method.return_value_rust_type}}, MethodResultCode> {
         println!("Handling {{method_name}}");
         {%-if method.return_value_type == 'struct'%}
         let rv = {{method.return_value_rust_type}} {
@@ -58,12 +60,8 @@ impl {{stinger.name | UpperCamelCase }}MethodHandlers for {{stinger.name | Upper
         self
     }
 }
-
-
 {%endif%}
 
-
-
 #[tokio::main]
 async fn main() {
     env_logger::Builder::from_default_env()

{stinger_ipc-0.0.26 → stinger_ipc-0.0.27}/stingeripc/templates/rust/server/src/lib.rs.jinja2

@@ -13,9 +13,8 @@ use mqttier::{MqttierClient{%if stinger.methods|length > 0 or stinger.properties
 use {{stinger.rust.common_package_name}}::payloads::{*, MethodResultCode};
 use std::any::Any;
 {%if stinger.methods|length > 0 %}
-//pub mod handler;
-//pub mod init;
-//pub use handler::{{stinger.name | UpperCamelCase }}MethodHandlers;
+use async_trait::async_trait;
+use tokio::sync::Mutex as AsyncMutex;
 use std::sync::{Arc, Mutex};
 {%endif%}
 {%if stinger.methods|length > 0 or stinger.properties|length > 0 %}
@@ -68,7 +67,7 @@ pub struct {{stinger.rust.server_struct_name}} {
     {%endif%}
     {%if stinger.methods|length > 0 %}
     /// Struct contains all the method handlers.
-    method_handlers: Arc<Mutex<Box<dyn {{stinger.name | UpperCamelCase }}MethodHandlers>>>,
+    method_handlers: Arc<AsyncMutex<Box<dyn {{stinger.name | UpperCamelCase }}MethodHandlers>>>,
     {%endif%}
     {%if stinger.properties|length > 0%}
     /// Struct contains all the properties.
@@ -85,7 +84,7 @@ pub struct {{stinger.rust.server_struct_name}} {
 }
 
 impl {{stinger.rust.server_struct_name}} {
-    pub async fn new(connection: &mut MqttierClient{%if stinger.methods|length > 0%}, method_handlers: Arc<Mutex<Box<dyn {{stinger.name | UpperCamelCase }}MethodHandlers>>> {%endif%}) -> Self {
+    pub async fn new(connection: &mut MqttierClient{%if stinger.methods|length > 0%}, method_handlers: Arc<AsyncMutex<Box<dyn {{stinger.name | UpperCamelCase }}MethodHandlers>>> {%endif%}) -> Self {
         {%if stinger.methods|length > 0 or stinger.properties|length > 0 %}
         // Create a channel for messages to get from the MqttierClient object to this {{stinger.rust.server_struct_name}} object.
         // The Connection object uses a clone of the tx side of the channel.
@@ -152,7 +151,7 @@ impl {{stinger.rust.server_struct_name}} {
 
     {%for method_name, method in stinger.methods.items()-%}
     /// Handles a request message for the {{method_name}} method.
-    async fn handle_{{method_name|snake_case}}_request(publisher: MqttierClient, handlers: Arc<Mutex<Box<dyn {{stinger.name | UpperCamelCase }}MethodHandlers>>>, msg: ReceivedMessage) {
+    async fn handle_{{method_name|snake_case}}_request(publisher: MqttierClient, handlers: Arc<AsyncMutex<Box<dyn {{stinger.name | UpperCamelCase }}MethodHandlers>>>, msg: ReceivedMessage) {
         let opt_corr_data = msg.correlation_data;
         let opt_resp_topic = msg.response_topic;
         {%if method.arg_list | length > 0 -%}
@@ -161,8 +160,8 @@ impl {{stinger.rust.server_struct_name}} {
         {%endif%}{# has arg_list #} 
         // call the method handler
         let rv: Result<{{method.return_value_rust_type}}, MethodResultCode> = {
-            let handler_guard = handlers.lock().unwrap();
-            (*handler_guard).handle_{{method_name|snake_case}}({%for arg in method.arg_list%}payload.{{arg.name}}{%if not loop.last%}, {%endif%}{%endfor%})
+            let handler_guard = handlers.lock().await;
+            handler_guard.handle_{{method_name|snake_case}}({%for arg in method.arg_list%}payload.{{arg.name}}{%if not loop.last%}, {%endif%}{%endfor%}).await
         };
 
         if let Some(resp_topic) = opt_resp_topic {
@@ -267,7 +266,7 @@ impl {{stinger.rust.server_struct_name}} {
 
         {%if stinger.methods|length > 0 -%}
         let method_handlers = self.method_handlers.clone();
-        self.method_handlers.lock().unwrap().initialize(self.clone()).expect("Failed to initialize method handlers");
+        self.method_handlers.lock().await.initialize(self.clone()).await;
         {%endif-%}
 
         let sub_ids = self.subscription_ids.clone();
@@ -304,13 +303,14 @@ impl {{stinger.rust.server_struct_name}} {
 
 }
 {%if stinger.methods|length > 0 %}
+#[async_trait]
 pub trait {{stinger.name | UpperCamelCase }}MethodHandlers: Send + Sync {
 
-    fn initialize(&mut self, server: {{stinger.rust.server_struct_name}}) -> Result<(), MethodResultCode>;
+    async fn initialize(&mut self, server: {{stinger.rust.server_struct_name}}) -> Result<(), MethodResultCode>;
 
     {%for method_name, method in stinger.methods.items()-%}
     /// Pointer to a function to handle the {{method_name}} method request.
-    fn handle_{{method_name|snake_case}}(&self, {%for arg in method.arg_list%}{{arg.name|snake_case}}: {{arg.rust_type}}{%if not loop.last%}, {%endif%}{%endfor%}) -> Result<{{method.return_value_rust_type}}, MethodResultCode>;
+    async fn handle_{{method_name|snake_case}}(&self, {%for arg in method.arg_list%}{{arg.name|snake_case}}: {{arg.rust_type}}{%if not loop.last%}, {%endif%}{%endfor%}) -> Result<{{method.return_value_rust_type}}, MethodResultCode>;
     
     {%endfor%}