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

package/nodes/AlarmSystemUltimate.html

@@ -2,16 +2,16 @@
   RED.nodes.registerType("AlarmSystemUltimate", {
     category: "Alarm Ultimate",
     color: "#A8DADC",
-    defaults: {
-      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 },
-      armCode: { value: "" },
-      duressCode: { value: "" },
+	    defaults: {
+	      name: { value: "" },
+	      controlTopic: { value: "alarm" },
+	      payloadPropName: { value: "payload", required: false },
+	      persistState: { value: true },
+	      syncTargets: { value: "" },
+	      requireCodeForArm: { value: false },
+	      requireCodeForDisarm: { value: true },
+	      armCode: { value: "" },
+	      duressCode: { value: "" },
 	      blockArmOnViolations: { value: true },
 	      exitDelaySeconds: { value: 30, validate: RED.validators.number() },
 	      entryDelaySeconds: { value: 30, validate: RED.validators.number() },
@@ -56,8 +56,14 @@
     paletteLabel: function () {
       return "Alarm System (BETA)";
 	    },
-		    oneditprepare: function () {
-		      const nodeId = this.id;
+			    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"] });
@@ -80,10 +86,12 @@
         this.sirenOffPayloadType || "bool",
       );
 
-      const zonesField = $("#node-input-zones");
-      zonesField.css("font-family", "monospace");
+	      const zonesField = $("#node-input-zones");
+	      const zonesSummary = $("#node-input-zones-summary");
+	      const syncTargetsField = $("#node-input-syncTargets");
+	      const syncTargetsUi = $("#node-input-syncTargets-ui");
 
-      function parseZonesText(text) {
+	      function parseZonesText(text) {
         const raw = String(text || "").trim();
         if (!raw) return [];
 
@@ -114,44 +122,147 @@
           }
         }
         return zones;
-      }
-
-      $("#node-input-zones-format").on("click", function (evt) {
-        evt.preventDefault();
-        try {
-          const zones = parseZonesText(zonesField.val());
-          zonesField.val(zones.length ? JSON.stringify(zones, null, 2) : "");
-        } catch (err) {
-          RED.notify(`Zones: ${err.message}`, "error");
-        }
-      });
-
-      $("#node-input-zones-legacy").on("click", function (evt) {
-        evt.preventDefault();
+	      }
+
+	      function parseSyncTargets(text) {
+	        const raw = String(text || "").trim();
+	        if (!raw) return {};
+	        try {
+	          const parsed = JSON.parse(raw);
+	          return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+	        } catch (_err) {
+	          return {};
+	        }
+	      }
+
+	      function normalizeSyncAction(value) {
+	        const v = String(value || "").trim().toLowerCase();
+	        if (v === "arm") return "arm";
+	        if (v === "disarm") return "disarm";
+	        return "leave";
+	      }
+
+		      function syncActionLabel(value) {
+		        const v = normalizeSyncAction(value);
+		        if (v === "arm") return "Arm";
+		        if (v === "disarm") return "Disarm";
+		        return "Leave as is";
+		      }
+
+		      function escapeHtml(text) {
+		        return String(text || "")
+		          .replace(/&/g, "&")
+		          .replace(/</g, "&lt;")
+		          .replace(/>/g, "&gt;")
+		          .replace(/"/g, "&quot;")
+		          .replace(/'/g, "&#039;");
+		      }
+
+		      function buildSyncTargetsUi() {
+		        if (!syncTargetsUi || !syncTargetsUi.length) return;
+		        try {
+		          const saved = parseSyncTargets(syncTargetsField.val());
+
+		          // Collect other Alarm nodes in the workspace.
+		          const other = [];
+		          try {
+		            if (RED && RED.nodes && typeof RED.nodes.eachNode === "function") {
+		              RED.nodes.eachNode((n) => {
+		                if (!n) return;
+		                const type = String(n.type || "");
+		                if (type !== "AlarmSystemUltimate") return;
+		                if (n.id === nodeId) return;
+		                other.push({ id: n.id, name: String(n.name || "").trim() });
+		              });
+		            }
+		          } catch (_err) {}
+
+		          other.sort((a, b) => {
+		            const an = (a.name || a.id).toLowerCase();
+		            const bn = (b.name || b.id).toLowerCase();
+		            return an.localeCompare(bn);
+		          });
+
+		          if (other.length === 0) {
+		            syncTargetsUi.html('<span style="color:#777;">No other Alarm nodes found.</span>');
+		            return;
+		          }
+
+		          const table = $('<table style="width:100%; border-collapse:collapse;"></table>');
+		          table.append(
+		            '<thead><tr>' +
+		              '<th style="text-align:left; padding:4px 6px;">Alarm</th>' +
+		              '<th style="text-align:left; padding:4px 6px; width:160px;">On ARM</th>' +
+		              '<th style="text-align:left; padding:4px 6px; width:160px;">On DISARM</th>' +
+		            '</tr></thead>',
+		          );
+
+		          const tbody = $("<tbody></tbody>");
+		          other.forEach((n) => {
+		            const rule = saved[n.id] && typeof saved[n.id] === "object" ? saved[n.id] : {};
+		            const onArm = normalizeSyncAction(rule.onArm);
+		            const onDisarm = normalizeSyncAction(rule.onDisarm);
+
+		            const armSel = $('<select style="width:100%;"></select>');
+		            const disarmSel = $('<select style="width:100%;"></select>');
+		            ["arm", "leave", "disarm"].forEach((v) => {
+		              armSel.append(`<option value="${v}">${syncActionLabel(v)}</option>`);
+		              disarmSel.append(`<option value="${v}">${syncActionLabel(v)}</option>`);
+		            });
+		            armSel.val(onArm);
+		            disarmSel.val(onDisarm);
+
+		            const tr = $("<tr></tr>");
+		            const label = n.name ? `${n.name}` : "(unnamed Alarm)";
+		            tr.append(
+		              `<td style="padding:4px 6px;">${escapeHtml(label)}</td>`,
+		            );
+		            const tdArm = $('<td style="padding:4px 6px;"></td>').append(armSel);
+		            const tdDisarm = $('<td style="padding:4px 6px;"></td>').append(disarmSel);
+		            tr.append(tdArm).append(tdDisarm);
+		            tbody.append(tr);
+
+		            function persist() {
+		              const next = parseSyncTargets(syncTargetsField.val());
+		              next[n.id] = {
+		                onArm: String(armSel.val() || "leave"),
+		                onDisarm: String(disarmSel.val() || "leave"),
+		              };
+		              syncTargetsField.val(JSON.stringify(next));
+		              try {
+		                syncTargetsField.trigger("change");
+		              } catch (_err) {}
+		            }
+
+		            armSel.on("change", persist);
+		            disarmSel.on("change", persist);
+		          });
+		          table.append(tbody);
+		          syncTargetsUi.empty().append(table);
+		        } catch (err) {
+		          syncTargetsUi.html(
+		            `<span style="color:#c00;">Unable to render sync list. Check browser console. (${escapeHtml(err && err.message ? err.message : err)})</span>`,
+		          );
+		        }
+		      }
+
+	      function updateZonesSummary() {
         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);
+          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-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 +275,100 @@
 	          "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();
+		      setTimeout(() => buildSyncTargetsUi(), 0);
+				    },
 			    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 +376,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,15 +438,26 @@
 
   <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>
 
-    <div class="form-row">
-	    <label for="node-input-name"
-	        ><i class="icon-tag"></i> Name</label
-	      >
+  <div class="form-row">
+    <label><i class="fa fa-random"></i> Sync other alarms</label>
+    <div style="width: 70%;">
+      <div class="form-tips" style="margin: 0 0 6px 0;">
+        When this Alarm is armed/disarmed, optionally arm/disarm other Alarm nodes in the workspace (codes are forwarded if present).
+      </div>
+      <div id="node-input-syncTargets-ui"></div>
+      <input type="hidden" id="node-input-syncTargets" />
+    </div>
+  </div>
+
+	    <div class="form-row">
+		    <label for="node-input-name"
+		        ><i class="icon-tag"></i> Name</label
+		      >
       <input type="text" id="node-input-name" placeholder="Name" />
     </div>
 
@@ -217,14 +476,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 +685,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 +702,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 +710,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.               |
@@ -500,16 +724,17 @@
   | Siren topic                        | Topic used on output 2 to turn the siren on/off (default: `controlTopic + "/siren"`).                                                |
   | Siren ON/OFF payload               | Values emitted on output 2 for siren on/off (typed).                                                                                 |
   | Siren duration (s)                 | Auto stop duration (`0` = latch until disarm).                                                                                       |
-  | 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).                  |
+	  | 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).                                                                             |
+		  | Sync other alarms                  | Optional: when this node is armed/disarmed, it can arm/disarm other Alarm nodes. The original `msg.code`/`msg.pin` are forwarded.    |
+		  | 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 +769,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 +807,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)