node-red-contrib-alarm-ultimate 0.1.0 → 0.1.1

package/nodes/AlarmUltimateState.js

@@ -32,6 +32,12 @@ module.exports = function (RED) {
       }
       lastMode = mode;
 
+      setNodeStatus({
+        fill: mode === 'disarmed' ? 'green' : 'red',
+        shape: 'dot',
+        text: mode === 'disarmed' ? 'Disarmed' : 'Armed',
+      });
+
       const msg = {
         topic: buildTopic(api && api.controlTopic),
         payload: mode,
@@ -54,7 +60,6 @@ module.exports = function (RED) {
       }
       const state = api.getState && typeof api.getState === 'function' ? api.getState() : null;
       const mode = state && state.state ? state.state.mode : null;
-      setNodeStatus({ fill: 'green', shape: 'dot', text: `Connected (${mode || 'unknown'})` });
       emitMode(mode, api, reason);
     }
 
@@ -84,4 +89,3 @@ module.exports = function (RED) {
 
   RED.nodes.registerType('AlarmUltimateState', AlarmUltimateState);
 };
-

package/nodes/AlarmUltimateZone.html

@@ -1,7 +1,7 @@
 <script type="text/javascript">
   RED.nodes.registerType("AlarmUltimateZone", {
     category: "Alarm Ultimate",
-    color: "#ffb3b3",
+    color: "#CFEFF0",
     defaults: {
       name: { value: "" },
       alarmId: { value: "", required: true },
@@ -11,7 +11,7 @@
     },
     inputs: 0,
     outputs: 1,
-    icon: "font-awesome/fa-bullseye",
+    icon: "alarm-ultimate-zone.svg",
     label: function () {
       return this.name || "Alarm Zone";
     },
@@ -65,7 +65,12 @@
             zoneSelect.empty();
             zoneSelect.append($("<option></option>").attr("value", "").text("-- select --"));
             zones.forEach((z) => {
-              const label = z.name ? `${z.name} (${z.id})` : z.id;
+              const topic = z.topic || z.topicPattern || "";
+              const label = z.name
+                ? topic
+                  ? `${z.name} (${topic})`
+                  : z.name
+                : topic || z.id;
               zoneSelect.append($("<option></option>").attr("value", z.id).text(label));
             });
             if (this.zoneId) zoneSelect.val(this.zoneId);
@@ -84,7 +89,7 @@
 
 <script type="text/html" data-template-name="AlarmUltimateZone">
   <div class="form-row">
-    <label>&nbsp;</label>
+    <label>WEB PAGE</label>
     <button type="button" class="red-ui-button" id="node-input-alarm-panel">
       <i class="fa fa-keyboard-o"></i> Panel
     </button>

package/nodes/AlarmUltimateZone.js

@@ -30,6 +30,16 @@ module.exports = function (RED) {
       if (lastOpen === open && reason !== 'init') return;
       lastOpen = open;
 
+      const zoneTopic =
+        evt && evt.zone ? evt.zone.topic || evt.zone.topicPattern || null : null;
+      const statusLabel = zoneTopic || zoneId || 'zone';
+
+      setNodeStatus({
+        fill: open ? 'red' : 'green',
+        shape: 'dot',
+        text: `${statusLabel}: ${open ? 'open' : 'closed'}`,
+      });
+
       const msg = {
         topic: buildTopic(evt && evt.controlTopic),
         payload: open,
@@ -59,8 +69,17 @@ module.exports = function (RED) {
         setNodeStatus({ fill: 'red', shape: 'ring', text: `Unknown zone (${zoneId})` });
         return;
       }
-      setNodeStatus({ fill: 'green', shape: 'dot', text: `Connected (${zoneId}: ${selected.open ? 'open' : 'closed'})` });
-      emitZone(Boolean(selected.open), { alarmId, controlTopic: ui.controlTopic, zone: { id: selected.id, name: selected.name, type: selected.type } }, reason);
+      emitZone(Boolean(selected.open), {
+        alarmId,
+        controlTopic: ui.controlTopic,
+        zone: {
+          id: selected.id,
+          name: selected.name,
+          type: selected.type,
+          topic: selected.topic || null,
+          topicPattern: selected.topicPattern || null,
+        },
+      }, reason);
     }
 
     function onZoneState(evt) {
@@ -88,4 +107,3 @@ module.exports = function (RED) {
 
   RED.nodes.registerType('AlarmUltimateZone', AlarmUltimateZone);
 };
-

package/nodes/icons/alarm-ultimate-siren.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" aria-hidden="true">
+  <path fill="#fff" d="M20 7c-6.1 0-11 4.9-11 11v3.1l-2.3 5c-.9 2 .5 4.3 2.7 4.3h21.2c2.2 0 3.6-2.3 2.7-4.3l-2.3-5V18c0-6.1-4.9-11-11-11z"/>
+  <path fill="#fff" opacity="0.55" d="M20 10.2c-4.3 0-7.8 3.5-7.8 7.8v4.1l-.7 1.5h17l-.7-1.5V18c0-4.3-3.5-7.8-7.8-7.8z"/>
+  <path fill="#fff" d="M14.8 31.2c.3 2.7 2.5 4.8 5.2 4.8s4.9-2.1 5.2-4.8H14.8z"/>
+  <path fill="#fff" opacity="0.75" d="M6.2 16.8c.6-4.2 3.4-7.7 7.3-9.3l.6 1.5c-3.3 1.4-5.7 4.3-6.2 7.9l-1.7-.1zm27.6 0-1.7.1c-.5-3.6-2.9-6.5-6.2-7.9l.6-1.5c3.9 1.6 6.7 5.1 7.3 9.3z"/>
+</svg>

package/nodes/icons/alarm-ultimate-state.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" aria-hidden="true">
+  <path fill="#fff" d="M20 4 32 9v10c0 8.2-5.2 14.7-12 17-6.8-2.3-12-8.8-12-17V9l12-5z"/>
+  <path fill="#fff" opacity="0.55" d="M20 9.5 12.5 13v6.5c0 6 3.6 10.6 7.5 12.4 3.9-1.8 7.5-6.4 7.5-12.4V13L20 9.5z"/>
+  <path fill="#fff" d="M13.6 22.6h4.2l1.4-5.2 2.4 9 1.1-3.8h3.7v1.8h-2.3l-2.4 8.2-2.4-8.9-1.2 4.7h-5.2v-1.8z"/>
+</svg>

package/nodes/icons/alarm-ultimate-zone.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" aria-hidden="true">
+  <path fill="#fff" d="M20 6a14 14 0 1 1 0 28 14 14 0 0 1 0-28zm0 3.2a10.8 10.8 0 1 0 0 21.6 10.8 10.8 0 0 0 0-21.6z"/>
+  <path fill="#fff" d="M20 14a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm0 3.2a2.8 2.8 0 1 0 0 5.6 2.8 2.8 0 0 0 0-5.6z"/>
+  <path fill="#fff" opacity="0.75" d="M20 10.2h1.6v3.2H20zM20 26.6h1.6v3.2H20zM26.6 19.2h3.2v1.6h-3.2zM10.2 19.2h3.2v1.6h-3.2z"/>
+</svg>

package/nodes/icons/alarm-ultimate.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" aria-hidden="true">
+  <path fill="#fff" d="M20 4 32 9v10c0 8.2-5.2 14.7-12 17-6.8-2.3-12-8.8-12-17V9l12-5z"/>
+  <path fill="#fff" opacity="0.55" d="M20 9.5 12.5 13v6.5c0 6 3.6 10.6 7.5 12.4 3.9-1.8 7.5-6.4 7.5-12.4V13L20 9.5z"/>
+  <path fill="#fff" d="M20 13.2 15.2 17v7.6h9.6V17L20 13.2zm-3.2 11.2V18.1L20 15.6l3.2 2.5v6.3h-6.4z"/>
+  <path fill="#fff" d="M19.2 19.6h1.6v4.8h-1.6z"/>
+</svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-alarm-ultimate",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Alarm System node for Node-RED.",
   "author": "Supergiovane (https://github.com/Supergiovane)",
   "license": "MIT",
@@ -30,4 +30,4 @@
   "scripts": {
     "test": "mocha test/**/*.spec.js"
   }
-}
+}