pxt-common-packages 9.3.6 → 9.3.10

package/libs/azureiot/azureiot.ts

@@ -17,6 +17,7 @@ namespace azureiot {
     let _messageBusId: number;
     let _receiveHandler: (msg: Json, sysProps: SMap<string>) => void;
     let _methodHandlers: SMap<(msg: Json) => Json>;
+    let twinRespHandlers: SMap<(status: number, body: any) => void>
 
     function log(msg: string) {
         console.add(logPriority, "azureiot: " + msg);
@@ -156,7 +157,6 @@ namespace azureiot {
             }
             catch {
                 // just ignore errors disconnecting
-                _mqttClient = undefined
             }
         }
     }
@@ -167,6 +167,7 @@ namespace azureiot {
     export function connect() {
         const c = mqttClient();
         if (!c.connected) {
+            c.connect() // start connect if not started yet
             // busy wait for connection
             const start = control.millis()
             const timeout = 30000
@@ -249,11 +250,17 @@ namespace azureiot {
             topic += encodeQuery(sysProps);
         if (len == null)
             len = msg.length
+        if (len > msg.length) {
+            log(`len too long: ${len}/${msg.length}`)
+            len = msg.length
+        }
         // qos, retained are not supported
-        c.startPublish(topic, len * 2)
-        const chunk = 128
-        for (let ptr = 0; ptr < len; ptr += chunk)
-            c.continuePublish(Buffer.fromUTF8(msg.slice(ptr, Math.min(chunk, len - ptr)).toHex()))
+        if (c.startPublish(topic, len * 2)) {
+            const chunk = 128
+            for (let ptr = 0; ptr < len; ptr += chunk)
+                c.continuePublish(Buffer.fromUTF8(msg.slice(ptr, Math.min(chunk, len - ptr)).toHex()))
+            c.finishPublish()
+        }
     }
 
     /**
@@ -313,16 +320,16 @@ namespace azureiot {
         c.publish('$iothub/methods/res/' + status + "/?$rid=" + props["$rid"], JSON.stringify(resp))
     }
 
-    let twinRespHandlers: SMap<(status: number, body: any) => void>
-
     // $iothub/twin/res/{status}/?$rid={request id}
     function twinResponse(msg: mqtt.IMessage) {
         const args = parseTopicArgs(msg.topic)
         const h = twinRespHandlers[args["$rid"]]
         const status = parseInt(msg.topic.slice(17))
         // log(`twin resp: ${status} ${msg.content.toHex()} ${msg.content.toString()}`)
-        if (h)
+        if (h) {
+            delete twinRespHandlers[args["$rid"]]
             h(status, JSON.parse(msg.content.toString() || "{}"))
+        }
     }
 
     export class ValueAwaiter {