stinger-ipc 0.0.26__py3-none-any.whl → 0.0.27__py3-none-any.whl

{stinger_ipc-0.0.26.dist-info → stinger_ipc-0.0.27.dist-info}/METADATA

@@ -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.dist-info → stinger_ipc-0.0.27.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stinger_ipc-0.0.26.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+stinger_ipc-0.0.27.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
 stingeripc/__init__.py,sha256=PTr5WfMfB-GL4vp3-XMU8IwGv3Q5RXQ24H7JuEo3hdk,133
 stingeripc/args.py,sha256=x3P8GRu9-jyiMl62t0FPqbWY18FbhMVN4eSa2UzUv6c,3960
 stingeripc/asyncapi.py,sha256=yyHDIM2Hm8stAPGmcuCostQ7Tk_YzVOqA2jAiqyp7j4,23445
@@ -47,17 +47,17 @@ stingeripc/templates/rust/payloads/Cargo.toml.jinja2,sha256=t6WQ5BCBvjagCW8AgK4V
 stingeripc/templates/rust/payloads/examples/pub_and_recv.rs.jinja2,sha256=cIbunwEwYGbkRO1lzi2nGNX2dGdFhAJ2ZZqFhphY7CY,1461
 stingeripc/templates/rust/payloads/src/lib.rs.jinja2,sha256=3vBn2OGm_j7BoyHRHLcH1e0hKRBiqtbgHsz04rTaVMM,86
 stingeripc/templates/rust/payloads/src/payloads.rs.jinja2,sha256=1PUSzmHLMBYsVaCR8gOMdHWK8dmODmLM3WSu9iysN-c,4380
-stingeripc/templates/rust/server/Cargo.toml.jinja2,sha256=t2MIpoe34RYOtxvpS6ma7W0A9sLlMQBYblpALU805TQ,573
-stingeripc/templates/rust/server/examples/server.rs.jinja2,sha256=L8Cgs1Wb1HFLyMqF0EARUtrgqoxXly6u4kaSElaNrHo,4851
-stingeripc/templates/rust/server/src/lib.rs.jinja2,sha256=rhackDGeDndEXoNXoldsc-jr7I-nP2uYKTZSnWXOaIU,15675
+stingeripc/templates/rust/server/Cargo.toml.jinja2,sha256=QwPnGhPWvYZit5ldr9hZ2AC9xn9dAVj_3Td-dO-Befw,593
+stingeripc/templates/rust/server/examples/server.rs.jinja2,sha256=WhkHXu45PQyAePv-yQdE_p_xYcuqIMSEAzD4Pn7U1A4,4752
+stingeripc/templates/rust/server/src/lib.rs.jinja2,sha256=0PRSB8OJIlbv1TFM8UjuD3bApbANW8fvUOi-pHJRMlQ,15637
 stingeripc/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stingeripc/tools/cli.py,sha256=RqeL6FcoeUCvle86jmox-4A25SL4Br2CSZXPKbaJwlY,3372
 stingeripc/tools/cpp_generator.py,sha256=jYIRVjykI4corEI65CsA7q42psFxfkgskasYcSXSbqY,3111
 stingeripc/tools/markdown_generator.py,sha256=HVEWcMjAfVnuWY29kxfAW1mvSxQSF-rdYFA2kWdLOn0,1174
 stingeripc/tools/python_generator.py,sha256=GJwGI6DntkJPJjHN4xSeTD60KgY32gI43IvIByxWSsw,1845
 stingeripc/tools/rust_generator.py,sha256=Im0EdNifxkGDnZy2JCuvKzmn1h2suk6EJ_xtpGZazGk,2240
-stinger_ipc-0.0.26.dist-info/METADATA,sha256=dIRomA-GKMIZRvcna1tVp-6QoanVoZ4wfRUT6rbu2Yk,6079
-stinger_ipc-0.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-stinger_ipc-0.0.26.dist-info/entry_points.txt,sha256=bh8k8mvtAog4MKTd82ALSHqQkuD069VrZ-vNlde6XjE,204
-stinger_ipc-0.0.26.dist-info/top_level.txt,sha256=mSNwAf83_1qiTP_vu7XEPBrZu-fDusT1FFyQZzCrRcU,11
-stinger_ipc-0.0.26.dist-info/RECORD,,
+stinger_ipc-0.0.27.dist-info/METADATA,sha256=523F72GNhrTsIxzv4DuC0F6d3ZTutmCdcSHbMXecnmk,6079
+stinger_ipc-0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+stinger_ipc-0.0.27.dist-info/entry_points.txt,sha256=bh8k8mvtAog4MKTd82ALSHqQkuD069VrZ-vNlde6XjE,204
+stinger_ipc-0.0.27.dist-info/top_level.txt,sha256=mSNwAf83_1qiTP_vu7XEPBrZu-fDusT1FFyQZzCrRcU,11
+stinger_ipc-0.0.27.dist-info/RECORD,,

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"

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()

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%}