pxt-common-packages 9.3.7 → 9.3.11

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P185064(s) {
+function _main___P185082(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___185305 = (undefined);
-    globals._pollEventQueue___185318 = (undefined);
+    globals._intervals___185323 = (undefined);
+    globals._pollEventQueue___185336 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P185064.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P185064.continuations = [  ]
+_main___P185082.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P185082.continuations = [  ]
 
-function _main___P185064_mk(s) {
+function _main___P185082_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P185064, depth: s.depth + 1,
+        parent: s, fn: _main___P185082, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P185064_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P185064
+return _main___P185082
 })

package/libs/mqtt/mqtt.ts

@@ -344,6 +344,8 @@ namespace mqtt {
         private piId: number;
 
         private buf: Buffer;
+        // we re-send subscriptions on re-connect
+        private subs: Buffer[] = [];
 
         public status = Status.Disconnected
 
@@ -465,8 +467,7 @@ namespace mqtt {
                 if (cnt++ < 100 && this.status == Status.Sending)
                     pause(20)
                 else {
-                    throw "drop pkt"
-                    //this.log("drop pkt")
+                    this.log("drop pkt")
                     return false
                 }
             }
@@ -485,7 +486,7 @@ namespace mqtt {
             if (this.startPublish(topic, buf ? buf.length : 0, qos, retained)) {
                 if (buf)
                     this.send(buf);
-                this.doneSending()
+                this.finishPublish()
             }
         }
 
@@ -502,11 +503,14 @@ namespace mqtt {
 
         public finishPublish() {
             this.doneSending()
+            this.emit("published")
         }
 
         private subscribeCore(topic: string, handler: (msg: IMessage) => void, qos: number = Constants.DefaultQos): MQTTHandler {
             this.log(`subscribe: ${topic}`)
-            this.send1(Protocol.createSubscribe(topic, qos));
+            const sub = Protocol.createSubscribe(topic, qos)
+            this.subs.push(sub)
+            this.send1(sub);
             if (handler) {
                 if (topic[topic.length - 1] == "#")
                     topic = topic.slice(0, topic.length - 1)
@@ -589,6 +593,8 @@ namespace mqtt {
                         this.emit('connected');
                         this.status = Status.Connected;
                         this.piId = setInterval(() => this.ping(), Constants.PingInterval * 1000);
+                        for (const sub of this.subs)
+                            this.send1(sub);
                     } else {
                         const connectionError: string = Client.describe(returnCode);
                         this.log('MQTT connection error: ' + connectionError);