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

package/examples/alarm-ultimate-dashboard.json

@@ -42,7 +42,6 @@
     "name": "Home Alarm",
     "controlTopic": "alarm",
     "payloadPropName": "payload",
-    "translatorConfig": "",
     "persistState": true,
     "requireCodeForArm": false,
     "requireCodeForDisarm": false,
@@ -93,7 +92,8 @@
     "fwdInMessages": false,
     "resendOnRefresh": true,
     "templateScope": "local",
-    "className": ""
+    "className": "",
+    "x": 520,
+    "y": 160
   }
 ]
-

package/nodes/AlarmSystemUltimate.html

@@ -6,7 +6,6 @@
       name: { value: "" },
       controlTopic: { value: "alarm" },
       payloadPropName: { value: "payload", required: false },
-      translatorConfig: { type: "translator-config", required: false },
       persistState: { value: true },
       requireCodeForArm: { value: false },
       requireCodeForDisarm: { value: true },
@@ -58,6 +57,12 @@
 	    },
 		    oneditprepare: function () {
 		      const nodeId = this.id;
+		      const origin = window.location.origin;
+		      const openerOrigin = origin;
+		      const bc =
+		        typeof BroadcastChannel === "function"
+		          ? new BroadcastChannel("alarm-ultimate-zones")
+		          : null;
 		      const payloadField = $("#node-input-payloadPropName");
 		      if (payloadField.val() === "") payloadField.val("payload");
 		      payloadField.typedInput({ default: "msg", types: ["msg"] });
@@ -81,7 +86,7 @@
       );
 
       const zonesField = $("#node-input-zones");
-      zonesField.css("font-family", "monospace");
+      const zonesSummary = $("#node-input-zones-summary");
 
       function parseZonesText(text) {
         const raw = String(text || "").trim();
@@ -116,42 +121,23 @@
         return zones;
       }
 
-      $("#node-input-zones-format").on("click", function (evt) {
-        evt.preventDefault();
+      function updateZonesSummary() {
         try {
           const zones = parseZonesText(zonesField.val());
-          zonesField.val(zones.length ? JSON.stringify(zones, null, 2) : "");
+          zonesSummary.text(zones.length ? `${zones.length} zones configured` : "No zones configured");
         } catch (err) {
-          RED.notify(`Zones: ${err.message}`, "error");
+          zonesSummary.text("Zones: invalid JSON");
         }
-      });
-
-      $("#node-input-zones-legacy").on("click", function (evt) {
-        evt.preventDefault();
-        try {
-          const zones = parseZonesText(zonesField.val());
-          const legacy = zones
-            .map((zone) => JSON.stringify(zone))
-            .filter(
-              (line) => line !== undefined && line !== null && line !== "",
-            )
-            .join("\n");
-          zonesField.val(legacy);
-        } catch (err) {
-          RED.notify(`Zones: ${err.message}`, "error");
-        }
-      });
+      }
 
-	      $("#node-input-zones-mapper").on("click", function (evt) {
-	        evt.preventDefault();
-	        const httpAdminRoot = (RED.settings && RED.settings.httpAdminRoot) || "/";
-	        const root = httpAdminRoot.endsWith("/") ? httpAdminRoot : `${httpAdminRoot}/`;
-	        window.open(
-	          `${root}alarm-ultimate/alarm-json-mapper`,
-	          "_blank",
-	          "noopener,noreferrer",
-	        );
-	      });
+      function openZonesManager() {
+        const httpAdminRoot = (RED.settings && RED.settings.httpAdminRoot) || "/";
+        const root = httpAdminRoot.endsWith("/") ? httpAdminRoot : `${httpAdminRoot}/`;
+        const currentName = String($("#node-input-name").val() || "").trim();
+        const namePart = currentName ? `&name=${encodeURIComponent(currentName)}` : "";
+        const idPart = nodeId ? `?id=${encodeURIComponent(nodeId)}${namePart}` : "";
+        window.open(`${root}alarm-ultimate/alarm-json-mapper${idPart}`, "_blank");
+      }
 
 	      $("#node-input-zones-panel").on("click", function (evt) {
 	        evt.preventDefault();
@@ -164,8 +150,99 @@
 	          "noopener,noreferrer",
 	        );
 	      });
+
+	      $("#node-input-zones-manage").on("click", function (evt) {
+	        evt.preventDefault();
+	        openZonesManager();
+	      });
+
+	      const messageListener = (evt) => {
+	        if (!evt || evt.origin !== openerOrigin) return;
+	        const data = evt.data && typeof evt.data === "object" ? evt.data : null;
+	        if (!data || typeof data.type !== "string") return;
+	        if (data.nodeId && data.nodeId !== nodeId) return;
+
+	        if (data.type === "alarm-ultimate-request-zones") {
+	          let zonesJson = "";
+	          try {
+	            const zones = parseZonesText(zonesField.val());
+	            zonesJson = zones.length ? JSON.stringify(zones, null, 2) : "";
+	          } catch (_err) {
+	            zonesJson = "";
+	          }
+	          try {
+	            evt.source.postMessage(
+	              {
+	                type: "alarm-ultimate-zones",
+	                nodeId,
+	                nodeName: String($("#node-input-name").val() || "").trim() || String(this.name || ""),
+	                zonesJson,
+	              },
+	              openerOrigin,
+	            );
+	          } catch (_err) {
+	            // ignore
+	          }
+	          try {
+	            if (bc) {
+	              bc.postMessage({
+	                type: "alarm-ultimate-zones",
+	                nodeId,
+	                nodeName: String($("#node-input-name").val() || "").trim() || String(this.name || ""),
+	                zonesJson,
+	              });
+	            }
+	          } catch (_err) {
+	            // ignore
+	          }
+	          return;
+	        }
+
+	        if (data.type === "alarm-ultimate-zones" && typeof data.zonesJson === "string") {
+	          zonesField.val(String(data.zonesJson || ""));
+	          try {
+	            zonesField.trigger("change");
+	          } catch (_err) {
+	            // ignore
+	          }
+	          try {
+	            if (RED && RED.nodes && typeof RED.nodes.dirty === "function") {
+	              RED.nodes.dirty(true);
+	            }
+	          } catch (_err) {
+	            // ignore
+	          }
+	          updateZonesSummary();
+	        }
+	      };
+
+	      window.addEventListener("message", messageListener);
+	      if (bc) {
+	        bc.addEventListener("message", (ev) => {
+	          const data = ev && ev.data && typeof ev.data === "object" ? ev.data : null;
+	          if (!data || typeof data.type !== "string") return;
+	          if (data.nodeId && data.nodeId !== nodeId) return;
+	          // Reuse the same handler surface by calling it with a minimal shape.
+	          messageListener({ origin: openerOrigin, data, source: null });
+	        });
+	        this._alarmUltimateZonesBroadcast = bc;
+	      }
+	      this._alarmUltimateZonesMessageListener = messageListener;
+	      updateZonesSummary();
 			    },
 			    oneditsave: function () {
+			      if (this._alarmUltimateZonesMessageListener) {
+			        window.removeEventListener("message", this._alarmUltimateZonesMessageListener);
+			        this._alarmUltimateZonesMessageListener = null;
+			      }
+			      if (this._alarmUltimateZonesBroadcast) {
+			        try {
+			          this._alarmUltimateZonesBroadcast.close();
+			        } catch (_err) {
+			          // ignore
+			        }
+			        this._alarmUltimateZonesBroadcast = null;
+			      }
 		      this.sirenOnPayloadType = $("#node-input-sirenOnPayload").typedInput(
 		        "type",
 	      );
@@ -173,10 +250,55 @@
         "type",
       );
     },
+    oneditcancel: function () {
+      if (this._alarmUltimateZonesMessageListener) {
+        window.removeEventListener("message", this._alarmUltimateZonesMessageListener);
+        this._alarmUltimateZonesMessageListener = null;
+      }
+      if (this._alarmUltimateZonesBroadcast) {
+        try {
+          this._alarmUltimateZonesBroadcast.close();
+        } catch (_err) {
+          // ignore
+        }
+        this._alarmUltimateZonesBroadcast = null;
+      }
+    },
   });
 </script>
 
 <script type="text/html" data-template-name="AlarmSystemUltimate">
+  <style>
+    .alarm-ultimate-editor .red-ui-button.au-btn {
+      border-radius: 8px;
+      font-weight: 600;
+      border-width: 1px;
+    }
+
+    .alarm-ultimate-editor .red-ui-button.au-btn i {
+      margin-right: 4px;
+    }
+
+    .alarm-ultimate-editor .red-ui-button.au-btn-primary {
+      background: #2563eb !important;
+      border-color: #1d4ed8 !important;
+      color: #fff !important;
+    }
+    .alarm-ultimate-editor .red-ui-button.au-btn-primary:hover {
+      background: #1d4ed8 !important;
+    }
+
+    .alarm-ultimate-editor .red-ui-button.au-btn-success {
+      background: #16a34a !important;
+      border-color: #15803d !important;
+      color: #fff !important;
+    }
+    .alarm-ultimate-editor .red-ui-button.au-btn-success:hover {
+      background: #15803d !important;
+    }
+  </style>
+
+  <div class="alarm-ultimate-editor">
   <div class="form-row">
     <b>Alarm System Ultimate (BETA)</b>
     &nbsp;&nbsp;<span style="color:red"
@@ -190,7 +312,7 @@
 
   <div class="form-row">
     <label>WEB PAGE</label>
-    <button type="button" class="red-ui-button" id="node-input-zones-panel">
+    <button type="button" class="red-ui-button au-btn au-btn-primary" id="node-input-zones-panel">
       <i class="fa fa-keyboard-o"></i> Panel
     </button>
   </div>
@@ -217,14 +339,6 @@
       <input type="text" id="node-input-payloadPropName" />
     </div>
 
-    <div class="form-row">
-	      <label
-	        for="node-input-translatorConfig"
-	        ><i class="fa fa-language"></i> Translator</label
-	      >
-      <input type="text" id="node-input-translatorConfig" />
-    </div>
-
     <div class="form-row">
 	    <label for="node-input-persistState"
 	        ><i class="fa fa-database"></i> Persist state</label
@@ -434,42 +548,16 @@
     </div>
 
     <div class="form-row">
-      <label for="node-input-zones"
-        ><i class="fa fa-th-large"></i> Zones (JSON per line or JSON
-        array)</label
-      >
-      <textarea
-        id="node-input-zones"
-        spellcheck="false"
-        wrap="off"
-        style="width:100%; height:220px; font-family:monospace;"
-        placeholder='{"id":"front_door","name":"Front door","topic":"sensor/frontdoor","type":"perimeter","entry":true,"bypassable":true,"chime":true}\n{"id":"pir_living","name":"Living PIR","topic":"sensor/living_pir","type":"motion","entry":false,"bypassable":true,"cooldownSeconds":10}'
-      ></textarea>
+      <label><i class="fa fa-th-large"></i> Zones</label>
+      <button type="button" class="red-ui-button au-btn au-btn-success" id="node-input-zones-manage">
+        <i class="fa fa-list"></i> Manage zones
+      </button>
+      <span id="node-input-zones-summary" style="margin-left:8px; color:#777;"></span>
     </div>
 
-    <div class="form-row">
-      <label>&nbsp;</label>
-      <button type="button" class="red-ui-button" id="node-input-zones-format">
-        <i class="fa fa-indent"></i> Format
-      </button>
-      <button
-        type="button"
-        class="red-ui-button"
-        id="node-input-zones-legacy"
-        style="margin-left:5px;"
-	      >
-	        <i class="fa fa-list"></i> Legacy
-	      </button>
-	      <button
-	        type="button"
-	        class="red-ui-button"
-	        id="node-input-zones-mapper"
-	        style="margin-left:5px;"
-	      >
-	        <i class="fa fa-external-link"></i> Mapper
-		      </button>
-		    </div>
-		</script>
+    <textarea id="node-input-zones" style="display:none;"></textarea>
+  </div>
+			</script>
 
 <script type="text/markdown" data-help-name="AlarmSystemUltimate">
   <p><b>BETA</b> – Alarm control panel node with a single armed/disarmed state, zones, entry/exit delays, bypass, chime, tamper/fire/24h zones, siren control, status and event log.</p>
@@ -477,7 +565,7 @@
   The node has 2 inputs "in one":
 
   - **Control messages**: when `msg.topic` equals **Control topic**.
-  - **Sensor messages**: any other message, matched to a zone by `msg.topic` and converted to boolean using **With Input** (default `payload`) and the optional **Translator**.
+  - **Sensor messages**: any other message, matched to a zone by `msg.topic` and converted to boolean using **With Input** (default `payload`).
 
   <br/>
 
@@ -485,7 +573,6 @@
   | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
   | Control topic                      | Topic that receives runtime commands (arm/disarm/status/bypass/siren/panic/reset).                                                   |
   | With Input                         | Message property evaluated as sensor value (default `payload`).                                                                      |
-  | Translator                         | Optional translator-config for true/false conversion (useful for Home Assistant strings).                                            |
   | Persist state                      | Persists arming state, bypass list and event log across restarts.                                                                    |
   | Require code for arm               | Requires a valid PIN for arming commands (via `msg.code` or `msg.pin`). If **Code** is empty, commands are allowed.                  |
   | Require code for disarm            | Requires a valid PIN for disarming commands (via `msg.code` or `msg.pin`). If **Code** is empty, commands are allowed.               |
@@ -503,13 +590,13 @@
   | Latch siren until disarm           | Forces siren to remain on until disarm (ignores duration).                                                                           |
   | Emit restore events                | Emits `zone_restore` when a zone returns to false.                                                                                   |
 	  | Event log size                     | Max stored log entries in node context (0 disables log).                                                                             |
-	  | Zones                              | Zone definitions. Supports legacy "one JSON object per line" or a JSON array (use **Format** / **Legacy** buttons).                  |
+	  | Zones                              | Zone definitions. Use **Manage zones** to edit with the web tool (advanced JSON is available there).                                 |
 
 	  <br/>
 
 	  ### Web tools
 
-	  - **Zones JSON Mapper**: available at `/alarm-ultimate/alarm-json-mapper` (or via the **Mapper** button).
+	  - **Zones Manager**: available at `/alarm-ultimate/alarm-json-mapper` (or via the **Manage zones** button).
 	  - **Alarm Panel**: available at `/alarm-ultimate/alarm-panel` (or via the **Panel** button).
 	  - The Alarm Panel supports `?id=<alarmNodeId>` and an embed mode for Dashboard: `?embed=1&id=<alarmNodeId>`.
 
@@ -544,7 +631,7 @@
 
   **Output 5 (Zone Activity)**
 
-  - Same message as Output 1, only for zone events (`bypassed`, `unbypassed`, `chime`, `zone_ignored_exit`, `zone_bypassed_trigger`, `zone_restore`).
+  - Same message as Output 1, only for zone events (`zone_open`, `zone_close`, `bypassed`, `unbypassed`, `chime`, `zone_ignored_exit`, `zone_bypassed_trigger`, `zone_restore`).
 
   **Output 6 (Errors/Denied)**
 
@@ -582,9 +669,11 @@
 
   Zones / alarm:
 
-  - `entry_delay` → `{ zone:{id,name}, seconds }`
+  - `entry_delay` → `{ zone:{id,name,type,topic}, seconds }`
   - `alarm` → `{ kind, zone, silent }` where `kind` can be `instant|entry_timeout|panic|duress|fire|tamper|24h|...`
   - `chime` → `{ zone:{id,name,type} }` (while disarmed)
+  - `zone_open` → `{ zone:{id,name,type,topic}, open:true, bypassed }` (always)
+  - `zone_close` → `{ zone:{id,name,type,topic}, open:false, bypassed }` (always)
   - `zone_ignored_exit` → `{ zone:{id,name,type} }` (triggered during exit delay and not allowed)
   - `zone_bypassed_trigger` → `{ zone:{id,name,type} }`
   - `zone_restore` → `{ zone:{id,name,type} }` (when enabled)

package/nodes/AlarmSystemUltimate.js

@@ -88,7 +88,8 @@ module.exports = function (RED) {
       try {
         const body = req.body && typeof req.body === 'object' ? req.body : {};
         api.command(body);
-        res.json({ ok: true });
+        const snapshot = api.getState && typeof api.getState === 'function' ? api.getState() : null;
+        res.json({ ok: true, result: snapshot });
       } catch (err) {
         res.status(500).json({ ok: false, error: err.message });
       }
@@ -255,6 +256,8 @@ module.exports = function (RED) {
       'bypassed',
       'unbypassed',
       'chime',
+      'zone_open',
+      'zone_close',
       'zone_ignored_exit',
       'zone_bypassed_trigger',
       'zone_restore',
@@ -550,6 +553,22 @@ module.exports = function (RED) {
       let shape = 'ring';
       let text = 'DISARMED';
 
+      // When idle/disarmed, show recent arming errors to make the reason visible in the editor status.
+      if (!state.alarmActive && !state.entry && !state.arming && state.mode === 'disarmed') {
+        const last = Array.isArray(state.log) && state.log.length ? state.log[state.log.length - 1] : null;
+        const evt = last && typeof last.event === 'string' ? last.event : '';
+        if (evt === 'arm_blocked') {
+          const violations = Array.isArray(last.violations) ? last.violations.length : 0;
+          fill = 'yellow';
+          shape = 'ring';
+          text = `ARM BLOCKED${violations ? ` (${violations})` : ''}`;
+        } else if (evt === 'denied' && last && String(last.action || '') === 'arm') {
+          fill = 'red';
+          shape = 'ring';
+          text = 'ARM DENIED';
+        }
+      }
+
       if (state.alarmActive) {
         fill = 'red';
         shape = 'dot';
@@ -1107,7 +1126,7 @@ module.exports = function (RED) {
       }
       const until = now() + delay;
       state.entry = { zoneId: zone.id, until };
-      emitEvent('entry_delay', { zone: { id: zone.id, name: zone.name }, seconds: remainingSeconds(until) }, baseMsg);
+      emitEvent('entry_delay', { zone: buildZoneSummary(zone), seconds: remainingSeconds(until) }, baseMsg);
       startStatusInterval();
       clearEntryTimer();
       entryTimer = timerBag.setTimeout(() => {
@@ -1177,7 +1196,7 @@ module.exports = function (RED) {
       }
       state.bypass[id] = Boolean(enabled);
       persist();
-      emitEvent(enabled ? 'bypassed' : 'unbypassed', { zone: { id: zone.id, name: zone.name } }, baseMsg);
+      emitEvent(enabled ? 'bypassed' : 'unbypassed', { zone: buildZoneSummary(zone) }, baseMsg);
     }
 
     function handleControlMessage(msg) {
@@ -1278,7 +1297,7 @@ module.exports = function (RED) {
       if (!zone) {
         return;
       }
-      const resolved = helpers.resolveInput(msg, payloadPropName, config.translatorConfig, RED);
+      const resolved = helpers.resolveInput(msg, payloadPropName, null, RED);
       const value = resolved.boolean;
       if (value === undefined) {
         return;
@@ -1290,8 +1309,20 @@ module.exports = function (RED) {
       zoneMeta.lastChangeAt = now();
       state.zoneState[zone.id] = zoneMeta;
 
+      if (changed) {
+        emitEvent(
+          value === true ? 'zone_open' : 'zone_close',
+          {
+            zone: buildZoneSummary(zone),
+            open: value === true,
+            bypassed: state.bypass[zone.id] === true,
+          },
+          msg
+        );
+      }
+
       if (changed && emitRestoreEvents && value === false) {
-        emitEvent('zone_restore', { zone: { id: zone.id, name: zone.name, type: zone.type } }, msg);
+        emitEvent('zone_restore', { zone: buildZoneSummary(zone) }, msg);
       }
 
       if (changed) {
@@ -1317,7 +1348,7 @@ module.exports = function (RED) {
       }
 
       if (state.bypass[zone.id] === true && zone.bypassable !== false) {
-        emitEvent('zone_bypassed_trigger', { zone: { id: zone.id, name: zone.name, type: zone.type } }, msg);
+        emitEvent('zone_bypassed_trigger', { zone: buildZoneSummary(zone) }, msg);
         return;
       }
 
@@ -1335,13 +1366,13 @@ module.exports = function (RED) {
       }
 
       if (state.arming && !zone.instantDuringExit) {
-        emitEvent('zone_ignored_exit', { zone: { id: zone.id, name: zone.name, type: zone.type } }, msg);
+        emitEvent('zone_ignored_exit', { zone: buildZoneSummary(zone) }, msg);
         return;
       }
 
       if (state.mode === 'disarmed') {
         if (zone.chime) {
-          emitEvent('chime', { zone: { id: zone.id, name: zone.name, type: zone.type } }, msg);
+          emitEvent('chime', { zone: buildZoneSummary(zone) }, msg);
         }
         return;
       }