version bump

todbot · Aug 24, 2024 · 65d0fce · 65d0fce
1 parent 6ef2e30
commit 65d0fce
Show file tree

Hide file tree

Showing 4 changed files with 10,466 additions and 18,344 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Blink1Control2",
-  "version": "2.2.9",
+  "version": "2.3.0",
   "author": "ThingM <[email protected]> (https://blink1.thingm.com/)",
   "description": "Blink1Control2 GUI app for blink(1) devices",
   "productName": "Blink1Control2",

diff --git a/app/server/mqttService.js b/app/server/mqttService.js
@@ -86,10 +86,11 @@ var MqttService = {
               self.errorLogged = true;
             });
             client.on('message', function (topic, message) {
-                self.parse(rule, message.toString());    // message is Buffer, thus .toString()
-                // Eventer.addStatus( {type:'trigger', source:rule.type, id:rule.name, text:message.toString()} );
-                Eventer.addStatus( {type:'info', source:rule.type, id:rule.name, text:message.toString()} );
-                log.msg("MqttService: message: topic:", topic, "message:",message.toString());
+              log.msg("MqttService: message: topic:", topic, "message:",message.toString());
+              // parse() will fill out Eventer.addStatus() for us
+              self.parse(rule, message.toString());  // message is Buffer, thus .toString()
+              // Eventer.addStatus( {type:'trigger', source:rule.type, id:rule.name, text:message.toString()} );
+              //Eventer.addStatus( {type:'info', source:rule.type, id:rule.name, text:message.toString()} );
             });
             rule.client = client;
         });
@@ -114,6 +115,7 @@ var MqttService = {
     },
 
     /**
+     * (FIXME: Copied from scriptService.parse(), pull these out into single common one)
      * Parse the output from a MQTT response.
      * Plays patterns if match.
      * Sends log messages with source & id of rule.
@@ -172,7 +174,11 @@ var MqttService = {
                         Eventer.addStatus( {type:'error', source:rule.type, id:rule.name, text:'invalid color '+json.color});
                     }
                 }
+                else {
+
+                }
             } catch(error) {
+                log.msg("error:", error)
                 Eventer.addStatus( {type:'error', source:rule.type, id:rule.name, text:error.message});
             }
         }