Merge pull request #40 from tomvictor/hotfix/v0.0.14

version update

Author: tomvictor

Cargo.lock

@@ -14,9 +14,8 @@ rumqttc = "0.22.0"
 rumqttd = "0.17.0"
 config = "0.13"
 bytes = "1"
-paho-mqtt = "0.12.1"
 
 [package.metadata.maturin]
 name = "iotcore._iotcore"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
-rumqttc = "0.20.0"
+rumqttc = "0.20.0"

Cargo.toml

@@ -53,15 +53,13 @@ def read_root():
 ```python
 from fastapi import FastAPI
 from contextlib import asynccontextmanager
-from iotcore import IotCore, IotCoreBroker
+from iotcore import IotCore
 
 iot = IotCore()
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    broker = IotCoreBroker("Broker")
-    broker.run_forever()
     iot.background_loop_forever()
     yield
 
@@ -73,6 +71,22 @@ app = FastAPI(lifespan=lifespan)
 def read_root():
     return {"Hello": "World"}
 
+
+def mqtt_callback(data):
+    print(f"iot >: {data}")
+
+
+@app.get("/sub")
+def read_root():
+    iot.subscribe("iot", mqtt_callback)
+    return {"response": "subscribed"}
+
+
+@app.get("/pub")
+def read_root():
+    iot.publish("iot", "test")
+    return {"response": "published"}
+
 ```
 
 

README.md

@@ -53,15 +53,13 @@ def read_root():
 ```python
 from fastapi import FastAPI
 from contextlib import asynccontextmanager
-from iotcore import IotCore, IotCoreBroker
+from iotcore import IotCore
 
 iot = IotCore()
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    broker = IotCoreBroker("Broker")
-    broker.run_forever()
     iot.background_loop_forever()
     yield
 
@@ -73,6 +71,22 @@ app = FastAPI(lifespan=lifespan)
 def read_root():
     return {"Hello": "World"}
 
+
+def mqtt_callback(data):
+    print(f"iot >: {data}")
+
+
+@app.get("/sub")
+def read_root():
+    iot.subscribe("iot", mqtt_callback)
+    return {"response": "subscribed"}
+
+
+@app.get("/pub")
+def read_root():
+    iot.publish("iot", "test")
+    return {"response": "published"}
+
 ```
 
 

docs/index.md

@@ -1,14 +1,12 @@
 from fastapi import FastAPI
 from contextlib import asynccontextmanager
-from iotcore import IotCore, IotCoreBroker
+from iotcore import IotCore
 
 iot = IotCore()
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    broker = IotCoreBroker("Broker")
-    broker.run_forever()
     iot.background_loop_forever()
     yield
 
@@ -36,8 +34,3 @@ def read_root():
     iot.publish("iot", "test")
     return {"response": "published"}
 
-
-@app.get("/reconnect")
-def read_root():
-    iot.reconnect()
-    return {"response": "ok"}

examples/fastapi/main.py

@@ -6,4 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-paho-mqtt = "0.12.1"
+paho-mqtt = "0.12.1"
+openssl = { version = "0.10", features = ["vendored"] }
+openssl-sys = "0.9.93"

examples/mqtt_rs/Cargo.lock

@@ -4,9 +4,7 @@ use paho_mqtt as mqtt;
 fn main() {
     // Initialize the logger from the environment
     // Create a client & define connect options
-    let host = env::args()
-        .nth(1)
-        .unwrap_or_else(|| "mqtt://0.0.0.0:1883".to_string());
+    let host = "mqtt://localhost:1883".to_string();
 
     let mut cli = mqtt::Client::new(host).unwrap_or_else(|e| {
         println!("Error creating the client: {:?}", e);