@hurenkam/hue-services 0.6.2 → 0.6.4

package/coverage/src/nodes/ServiceNode.js.html

@@ -109,7 +109,7 @@ module.exports = ServiceNode;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-12-09T16:53:43.105Z
+                at 2023-02-03T22:21:29.454Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/nodes/TemperatureNode.js.html

@@ -187,7 +187,7 @@ module.exports = TemperatureNode;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-12-09T16:53:43.105Z
+                at 2023-02-03T22:21:29.454Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/nodes/ZigbeeConnectivityNode.js.html

@@ -184,7 +184,7 @@ module.exports = ZigbeeConnectivityNode;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-12-09T16:53:43.105Z
+                at 2023-02-03T22:21:29.454Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/nodes/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">98.01% </span>
+                <span class="strong">98.87% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>345/352</span>
+                <span class='fraction'>353/357</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">98.21% </span>
+                <span class="strong">99.13% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>110/112</span>
+                <span class='fraction'>115/116</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">96.96% </span>
+                <span class="strong">97.05% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>64/66</span>
+                <span class='fraction'>66/68</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">98% </span>
+                <span class="strong">98.87% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>343/350</span>
+                <span class='fraction'>351/355</span>
             </div>
         
             
@@ -215,17 +215,17 @@
 
 <tr>
 	<td class="file high" data-value="ResourceNode.js"><a href="ResourceNode.js.html">ResourceNode.js</a></td>
-	<td data-value="90.9" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 90%"></div><div class="cover-empty" style="width: 10%"></div></div>
+	<td data-value="97.95" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 97%"></div><div class="cover-empty" style="width: 3%"></div></div>
 	</td>
+	<td data-value="97.95" class="pct high">97.95%</td>
+	<td data-value="49" class="abs high">48/49</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="20" class="abs high">20/20</td>
 	<td data-value="90.9" class="pct high">90.9%</td>
-	<td data-value="44" class="abs high">40/44</td>
-	<td data-value="93.75" class="pct high">93.75%</td>
-	<td data-value="16" class="abs high">15/16</td>
-	<td data-value="88.88" class="pct high">88.88%</td>
-	<td data-value="9" class="abs high">8/9</td>
-	<td data-value="90.9" class="pct high">90.9%</td>
-	<td data-value="44" class="abs high">40/44</td>
+	<td data-value="11" class="abs high">10/11</td>
+	<td data-value="97.95" class="pct high">97.95%</td>
+	<td data-value="49" class="abs high">48/49</td>
 	</tr>
 
 <tr>
@@ -296,7 +296,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-12-09T16:53:43.105Z
+                at 2023-02-03T22:21:29.454Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hurenkam/hue-services",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Custom node-red nodes for interfacing with philips hue devices",
   "author": "Mark Hurenkamp",
   "license": "Apache 2.0",
@@ -44,10 +44,10 @@
     "access": "public"
   },
   "devDependencies": {
+    "mocha": "^10.1.0",
     "node-red": "^2.2.3",
     "node-red-node-test-helper": "^0.2.7",
-    "mocha": "^10.1.0",
     "nyc": "^15.1.0",
-    "sinon": "^15.0.0"
+    "sinon": "^15.0.1"
   }
 }

package/src/nodes/ResourceNode.js

@@ -40,6 +40,10 @@ class ResourceNode extends BaseNode {
             instance.onUpdate(event);
         }
 
+        if (this.startevent()==true) {
+            this.onStartup(resource.data())
+        }
+
         this.resource().on('update',this.#onUpdate);
         this.updateStatus();
     }
@@ -59,10 +63,19 @@ class ResourceNode extends BaseNode {
         return this.config.uuid;
     }
 
+    startevent() {
+        return this.config.startevent;
+    }
+
     bridge() {
         return BaseNode.nodeAPI.nodes.getNode(this.config.bridge);
     }
 
+    onStartup(event) {
+        this.#trace("onStartup()");
+        this.send({ payload: event });
+    }
+
     onUpdate(event) {
         this.#trace("onUpdate()");
         this.send({ payload: event });

package/src/ui/BaseUI.js

@@ -75,9 +75,7 @@ export class BaseUI {
         item.setAttribute("id","node-container-" + id);
         item.innerHTML = '\
             <div style="display: inline-flex; width: calc(100% - 105px)">\
-                <div id="input-select-'+ id +'" style="flex-grow: 1;">\
-                    <input type="checkbox" id="' + prefix + id +'" style="flex: 15px;">\
-                </div>\
+                <input type="checkbox" id="' + prefix + id +'" style="flex: 15px;">\
                 <span style="width: 100%; margin-left: 10px;">\
                     '+ label +'\
                 </span>\

package/src/ui/ResourceUI.js

@@ -8,9 +8,10 @@ export class ResourceUI extends BaseUI {
         super(label,category);
         console.log("ResourceUI.constructor()");
 
-        this.config.defaults.name =     { value:"" };
-        this.config.defaults.bridge =   { type: "@hurenkam/hue-services/BridgeConfigNode", required: true };
-        this.config.defaults.uuid =     { value:"", required: true };
+        this.config.defaults.name =       { value:"" };
+        this.config.defaults.bridge =     { type: "@hurenkam/hue-services/BridgeConfigNode", required: true };
+        this.config.defaults.uuid =       { value:"", required: true };
+        this.config.defaults.startevent = { value: false };
 
         this.config.inputs = 1;
         this.config.color = "#EEEEEE";
@@ -29,6 +30,8 @@ Select the hue bridge for your device or resource.\n\n\
 Select the device or service by UUID, you can toggle between search \
 and manual input. The search will query the bridge for suitable devices \
 and present them as a selection list.\n\n\
+#### Send current state event at startup\n\
+When this flag is enabled the node will send an event at startup with its initial state.\n\
 ";
         return help;
     }
@@ -38,6 +41,7 @@ and present them as a selection list.\n\n\
         console.log("ResourceUI.ui()");
         text += this.uiTextInput("bridge","Bridge");
         text += this.uiSelectInput("uuid","UUID");
+        text += this.uiCheckboxInput("startevent","Send current state event at startup");
         return text;
     }
 

package/src/ui/ServiceUI.js

@@ -5,11 +5,12 @@ export class ServiceUI extends BaseUI {
         super(label,category);
         console.log("ServiceUI.constructor(",label,category,rtype,")");
 
-        this.config.defaults.name =     { value:"" };
-        this.config.defaults.bridge =   { type: "@hurenkam/hue-services/BridgeConfigNode", required: true };
-        this.config.defaults.rtype =    { value:rtype, required: true };
-        this.config.defaults.owner =    { value:"", required: true };
-        this.config.defaults.uuid =     { value:"", required: true };
+        this.config.defaults.name =       { value:"" };
+        this.config.defaults.bridge =     { type: "@hurenkam/hue-services/BridgeConfigNode", required: true };
+        this.config.defaults.rtype =      { value:rtype, required: true };
+        this.config.defaults.owner =      { value:"", required: true };
+        this.config.defaults.uuid =       { value:"", required: true };
+        this.config.defaults.startevent = { value: false };
 
         this.config.inputs = 1;
         this.config.color = "#EEEEEE";
@@ -35,6 +36,8 @@ this field is hidden, and the one choice is automatically selected. \n\n\
 If not, then it offers you a choice of either filling in the UUID of the service \
 to be selected, or you can select one from the list which is offered. \
 \n\n\
+#### Send current state event at startup\n\
+When this flag is enabled the node will send an event at startup with its initial state.\n\
 ";
         return help;
     }
@@ -47,6 +50,7 @@ to be selected, or you can select one from the list which is offered. \
         text += this.uiSelectInput("rtype","Type");
         text += this.uiSelectInput("owner","Owner");
         text += this.uiSelectInput("uuid","UUID");
+        text += this.uiCheckboxInput("startevent","Send current state event at startup");
         return text;
     }
 

package/test/ResourceNode_spec.js

@@ -104,6 +104,38 @@ describe('Resource Node', function () {
         });
     });
 
+    it('should call onStartup() when start() is called and startevent() returns true', function (done) {
+        var flow = [{
+            id: "n1",
+            type: "ResourceNode",
+        }];
+
+        const fakeRequestStartup = sandbox.fake(() => {
+            return { requestStartup: function(resource) {} };
+        });
+        const fakeStartevent = sandbox.fake(() => {
+            return true;
+        });
+        const fakeOnStartup = sandbox.fake(() => {
+            done();
+        });
+        sandbox.replace(ResourceNode.prototype,'bridge',fakeRequestStartup);
+        sandbox.replace(ResourceNode.prototype,'startevent',fakeStartevent);
+        sandbox.replace(ResourceNode.prototype,'onStartup',fakeOnStartup);
+
+        helper.load(testnodes, flow, function () {
+            var n1 = helper.getNode("n1");
+            n1.start({
+                on: function(event,callback) {
+                    assert.equal(event,'update');
+                },
+                data: function(event,callback) {
+                    return { brightness: 100 };
+                }
+            });
+        });
+    });
+
     it('should return resource provided in start(resource) call when resource() is called', function (done) {
         var flow = [{
             id: "n1",
@@ -153,6 +185,27 @@ describe('Resource Node', function () {
     // Todo:
     // - bridge()
 
+    it('should call send() when onStartup(event) is called', function (done) {
+        var uuid = "c9f1b449-d9de-41c6-8bd4-46368eedd447";
+        var flow = [{
+            id: "n1",
+            type: "ResourceNode",
+            wires: [["n2"]]
+        },{
+            id: "n2",
+            type: "helper"
+        }];
+
+        helper.load(testnodes, flow, function () {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function (msg) {
+                done();
+            });
+            n1.onStartup({ name: "event" });
+        });
+    });
+
     it('should call send() when onUpdate(event) is called', function (done) {
         var uuid = "c9f1b449-d9de-41c6-8bd4-46368eedd447";
         var flow = [{

package/.nyc_output/ecb1b16f-015c-458b-96d5-32cb9569c1e8.json

@@ -1 +0,0 @@
-{}

package/.nyc_output/processinfo/ecb1b16f-015c-458b-96d5-32cb9569c1e8.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1610421,"argv":["/usr/bin/node","/home/hurenkam/Workspace/node-red-contrib-mh-hue/node_modules/.bin/mocha","test/**/BaseUI_spec.js"],"execArgv":[],"cwd":"/home/hurenkam/Workspace/node-red-contrib-mh-hue","time":1670929477202,"ppid":1610410,"coverageFilename":"/home/hurenkam/Workspace/node-red-contrib-mh-hue/.nyc_output/ecb1b16f-015c-458b-96d5-32cb9569c1e8.json","externalId":"","uuid":"ecb1b16f-015c-458b-96d5-32cb9569c1e8","files":[]}