stinger-ipc 0.0.8__tar.gz → 0.0.10__tar.gz

{stinger_ipc-0.0.8/stinger_ipc.egg-info → stinger_ipc-0.0.10}/PKG-INFO

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

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10}/pyproject.toml

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

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10/stinger_ipc.egg-info}/PKG-INFO

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

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10}/stingeripc/templates/python/connection.py.jinja2

@@ -45,7 +45,7 @@ class {{broker.class_name}}(BrokerConnection):
     class PendingSubscription:
         def __init__(self, topic: str, subscription_id: int):
             self.topic = topic
-            self.subscription_id
+            self.subscription_id = subscription_id
 
     def __init__(self{%if broker.hostname is none%}, host: str, port: int{%endif%}):
         self._logger = logging.getLogger('Connection')
@@ -83,6 +83,7 @@ class {{broker.class_name}}(BrokerConnection):
         self._message_callback = callback
 
     def _on_message(self, client, userdata, msg):
+        self._logger.debug("Got a message to %s", msg.topic)
         if self._message_callback:
             properties = msg.properties.__dict__ if hasattr(msg, 'properties') else {}
             if "UserProperty" in properties:

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10}/stingeripc/templates/rust/client/Cargo.toml.jinja2

@@ -14,6 +14,8 @@ num-traits = "0.2.19"
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
+log = "0.4"
+env_logger = "0.10"
 
 [dependencies.uuid]
 version = "1.2.1"
@@ -24,4 +26,4 @@ features = [
 ]
 [[example]]
 name = "{{stinger.name | snake_case}}_client_demo"
-path = "examples/client.rs"
+path = "examples/client.rs"

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10}/stingeripc/templates/rust/server/Cargo.toml.jinja2

@@ -13,6 +13,8 @@ num-traits = "0.2.19"
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
+log = "0.4"
+env_logger = "0.10"
 
 [[example]]
 name = "{{stinger.name | snake_case}}_server_demo"

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10}/stingeripc/templates/rust/server/examples/server.rs.jinja2

@@ -33,6 +33,10 @@ fn {{method_name|snake_case}}_handler({%for arg in method.arg_list%}_{{arg.name|
 
 #[tokio::main]
 async fn main() {
+    env_logger::Builder::from_default_env()
+    .target(env_logger::Target::Stdout)
+    .init();
+
     block_on(async {
         {%set broker = stinger.get_example_broker()%}
         let mut connection = MqttierClient::new("localhost", 1883, None).unwrap();

{stinger_ipc-0.0.8 → stinger_ipc-0.0.10}/stingeripc/templates/rust/server/src/lib.rs.jinja2

@@ -50,13 +50,13 @@ struct {{stinger.name | UpperCamelCase}}Properties {
 }
 {%endif%}
 {%endif%}{# any methods or properties #}
-
+#[derive(Clone)]
 pub struct {{stinger.rust.server_struct_name}} {
     mqttier_client: MqttierClient,
     {%if stinger.methods|length > 0 or stinger.properties|length > 0 %}
     /// Temporarily holds the receiver for the MPSC channel.  The Receiver will be moved
     /// to a process loop when it is needed.  MQTT messages will be received with this.
-    msg_streamer_rx: Option<mpsc::Receiver<ReceivedMessage>>,
+    msg_streamer_rx: Arc<Mutex<Option<mpsc::Receiver<ReceivedMessage>>>>,
 
     /// The Sender side of MQTT messages that are received from the broker.  This tx
     /// side is cloned for each subscription made.
@@ -133,7 +133,7 @@ impl {{stinger.rust.server_struct_name}} {
         {{stinger.rust.server_struct_name}} {
             mqttier_client: connection.clone(),
             {%if stinger.methods|length > 0 or stinger.properties|length > 0 %}
-            msg_streamer_rx: Some(message_received_rx),
+            msg_streamer_rx: Arc::new(Mutex::new(Some(message_received_rx))),
             msg_streamer_tx: message_received_tx,{%if stinger.methods | length > 0 %}
             method_handlers: method_handlers,{%endif%}{%if stinger.properties | length > 0 %}
             properties: property_values,{%endif%}
@@ -151,7 +151,7 @@ impl {{stinger.rust.server_struct_name}} {
             {{arg.name}}: {{arg.name|snake_case}},
             {%endfor%}
         };
-        let _ = self.mqttier_client.publish_state("{{sig.topic}}".to_string(), &data, 1).await;
+        let _ = self.mqttier_client.publish_structure("{{sig.topic}}".to_string(), &data).await;
     }
     {%endfor%}
 
@@ -199,6 +199,7 @@ impl {{stinger.rust.server_struct_name}} {
         let new_data = {{prop_name | UpperCamelCase}}Property {
             {{prop.arg_list[0].name}}: data,
         };
+        println!("Publishing to topic {}", topic);
         let _pub_result = publisher.publish_state(topic, &new_data, 1).await;
         {%else%}
         let _pub_result = publisher.publish_state(topic, &data, 1).await;
@@ -254,7 +255,9 @@ impl {{stinger.rust.server_struct_name}} {
 
         {%if stinger.methods|length > 0 or stinger.properties|length > 0 %}
         // Take ownership of the RX channel that receives MQTT messages.  This will be moved into the loop_task.
-        let mut message_receiver = self.msg_streamer_rx.take().expect("msg_streamer_rx should be Some");
+        let mut message_receiver = {
+            self.msg_streamer_rx.lock().unwrap().take().expect("msg_streamer_rx should be Some")
+        };
 
         {%if stinger.methods|length > 0 -%}
         let mut method_handlers = self.method_handlers.clone();