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

package/nodes/AlarmSystemUltimate.js

@@ -32,6 +32,19 @@ function writeJsonFileAtomicSync(filePath, data) {
 module.exports = function (RED) {
   const helpers = require('./lib/node-helpers.js');
 
+  function parseJsonObject(value) {
+    const raw = String(value || '').trim();
+    if (!raw) {
+      return null;
+    }
+    try {
+      const parsed = JSON.parse(raw);
+      return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : null;
+    } catch (_err) {
+      return null;
+    }
+  }
+
   if (RED && RED.httpAdmin && typeof RED.httpAdmin.get === 'function') {
     const needsRead =
       RED.auth && typeof RED.auth.needsPermission === 'function'
@@ -79,6 +92,27 @@ module.exports = function (RED) {
       res.json(api.getState());
     });
 
+    RED.httpAdmin.get('/alarm-ultimate/alarm/:id/log', needsRead, (req, res) => {
+      const api = alarmInstances.get(req.params.id);
+      if (!api) {
+        res.sendStatus(404);
+        return;
+      }
+      const getLog = api.getLog && typeof api.getLog === 'function' ? api.getLog : null;
+      if (!getLog) {
+        res.status(501).json({ ok: false, error: 'log_not_supported' });
+        return;
+      }
+      const since = Number(req.query && req.query.since);
+      const limit = Number(req.query && req.query.limit);
+      res.json(
+        getLog({
+          since: Number.isFinite(since) ? since : null,
+          limit: Number.isFinite(limit) ? limit : null,
+        })
+      );
+    });
+
     RED.httpAdmin.post('/alarm-ultimate/alarm/:id/command', needsWrite, (req, res) => {
       const api = alarmInstances.get(req.params.id);
       if (!api) {
@@ -106,6 +140,7 @@ module.exports = function (RED) {
 
     const controlTopic = config.controlTopic || 'alarm';
     const payloadPropName = config.payloadPropName || 'payload';
+    const syncTargetsConfig = parseJsonObject(config.syncTargets) || {};
 
     const requireCodeForArm = config.requireCodeForArm === true;
     const requireCodeForDisarm = config.requireCodeForDisarm !== false;
@@ -697,6 +732,27 @@ module.exports = function (RED) {
       };
     }
 
+    function getLogSnapshot(opts) {
+      const options = opts && typeof opts === 'object' ? opts : {};
+      const since = Number.isFinite(Number(options.since)) ? Number(options.since) : null;
+      const limit = Number.isFinite(Number(options.limit)) ? clampInt(options.limit, 200, 0, 500) : null;
+
+      const all = Array.isArray(state.log) ? state.log : [];
+      const filtered = since ? all.filter((e) => (e && Number(e.ts)) > since) : all;
+      const out = limit === null ? filtered : limit === 0 ? [] : filtered.slice(-limit);
+
+      return {
+        id: node.id,
+        name: node.name || '',
+        now: now(),
+        total: all.length,
+        returned: out.length,
+        since,
+        limit,
+        log: out.map((e) => ({ ...(e || {}) })),
+      };
+    }
+
     function buildZoneSummary(zone) {
       return {
         id: zone ? zone.id : null,
@@ -1035,6 +1091,7 @@ module.exports = function (RED) {
       state.mode = 'disarmed';
       persist();
       emitEvent('disarmed', { reason, duress: Boolean(duress) }, baseMsg);
+      return true;
     }
 
     function violatedZonesForArm() {
@@ -1057,13 +1114,13 @@ module.exports = function (RED) {
     function arm(baseMsg, reason) {
       if (state.mode === 'armed' && !state.arming) {
         emitEvent('already_armed', { target: 'armed' }, baseMsg);
-        return;
+        return true;
       }
 
       const violations = blockArmOnViolations ? violatedZonesForArm() : [];
       if (blockArmOnViolations && violations.length > 0) {
         emitEvent('arm_blocked', { target: 'armed', violations }, baseMsg);
-        return;
+        return false;
       }
 
       stopOpenZonesDuringArming();
@@ -1084,7 +1141,7 @@ module.exports = function (RED) {
         stopOpenZonesDuringArming();
         persist();
         emitEvent('armed', { reason }, baseMsg);
-        return;
+        return true;
       }
 
       const until = now() + exitDelayMs;
@@ -1113,6 +1170,55 @@ module.exports = function (RED) {
         persist();
         emitEvent('armed', { reason }, baseMsg);
       }, exitDelayMs);
+      return true;
+    }
+
+    function isSyncedControlMessage(msg) {
+      return Boolean(msg && typeof msg === 'object' && msg._alarmUltimateSync);
+    }
+
+    function normalizeSyncAction(value) {
+      const v = String(value || '').toLowerCase().trim();
+      if (v === 'arm') return 'arm';
+      if (v === 'disarm') return 'disarm';
+      return 'leave';
+    }
+
+    function syncOtherAlarms(trigger, baseMsg) {
+      if (!syncTargetsConfig || typeof syncTargetsConfig !== 'object') {
+        return;
+      }
+      if (isSyncedControlMessage(baseMsg)) {
+        return;
+      }
+      const when = trigger === 'disarm' ? 'onDisarm' : 'onArm';
+      const entries = Object.entries(syncTargetsConfig);
+      if (!entries.length) {
+        return;
+      }
+      for (const [targetId, rule] of entries) {
+        if (!targetId || targetId === node.id) continue;
+        const action = normalizeSyncAction(rule && typeof rule === 'object' ? rule[when] : '');
+        if (action === 'leave') continue;
+        const api = alarmInstances.get(targetId);
+        if (!api || typeof api.command !== 'function') continue;
+
+        const payload = {
+          command: action,
+          _alarmUltimateSync: {
+            origin: node.id,
+            trigger,
+          },
+        };
+        if (typeof baseMsg.code === 'string') payload.code = baseMsg.code;
+        if (typeof baseMsg.pin === 'string') payload.pin = baseMsg.pin;
+
+        try {
+          api.command(payload);
+        } catch (_err) {
+          // ignore
+        }
+      }
     }
 
     function startEntryDelay(zone, baseMsg) {
@@ -1260,9 +1366,11 @@ module.exports = function (RED) {
         if (validation.duress) {
           triggerAlarm('duress', null, msg, true);
           disarm(msg, 'duress', true);
+          syncOtherAlarms('disarm', msg);
           return true;
         }
         disarm(msg, 'manual', false);
+        syncOtherAlarms('disarm', msg);
         return true;
       }
 
@@ -1285,7 +1393,10 @@ module.exports = function (RED) {
         if (validation.duress) {
           triggerAlarm('duress', null, msg, true);
         }
-        arm(msg, 'manual');
+        const accepted = arm(msg, 'manual');
+        if (accepted) {
+          syncOtherAlarms('arm', msg);
+        }
         return true;
       }
 
@@ -1405,6 +1516,7 @@ module.exports = function (RED) {
       name: node.name || '',
       controlTopic,
       getState: getUiState,
+      getLog: getLogSnapshot,
       command(body) {
         const payload = body && typeof body === 'object' ? body : {};
         const msg = { topic: controlTopic };
@@ -1433,6 +1545,9 @@ module.exports = function (RED) {
         if (typeof payload.zone === 'string') {
           msg.zone = payload.zone;
         }
+        if (payload._alarmUltimateSync && typeof payload._alarmUltimateSync === 'object') {
+          msg._alarmUltimateSync = payload._alarmUltimateSync;
+        }
 
         node.receive(msg);
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-alarm-ultimate",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Alarm System node for Node-RED.",
   "author": "MAssimo Saccani (https://github.com/Supergiovane)",
   "license": "MIT",

package/test/alarm-system.spec.js

@@ -518,4 +518,65 @@ describe('AlarmSystemUltimate node', function () {
       })
       .catch(done);
   });
+
+  it('syncs arm/disarm to other Alarm nodes', function (done) {
+    const flowId = 'alarm-sync';
+    const flow = [
+      { id: flowId, type: 'tab', label: 'alarm-sync' },
+      {
+        id: 'alarmA',
+        type: 'AlarmSystemUltimate',
+        z: flowId,
+        name: 'Alarm A',
+        controlTopic: 'alarmA',
+        exitDelaySeconds: 0,
+        requireCodeForDisarm: false,
+        syncTargets: JSON.stringify({
+          alarmB: { onArm: 'arm', onDisarm: 'disarm' },
+        }),
+        wires: [['aEvents']],
+      },
+      { id: 'aEvents', type: 'helper', z: flowId },
+      {
+        id: 'alarmB',
+        type: 'AlarmSystemUltimate',
+        z: flowId,
+        name: 'Alarm B',
+        controlTopic: 'alarmB',
+        exitDelaySeconds: 0,
+        requireCodeForDisarm: false,
+        wires: [['bEvents']],
+      },
+      { id: 'bEvents', type: 'helper', z: flowId },
+    ];
+
+    loadAlarm(flow)
+      .then(() => {
+        const alarmA = helper.getNode('alarmA');
+        const bEvents = helper.getNode('bEvents');
+
+        const seenB = [];
+        bEvents.on('input', (msg) => {
+          if (msg && typeof msg.event === 'string') {
+            seenB.push(msg.event);
+          }
+        });
+
+        alarmA.receive({ topic: 'alarmA', command: 'arm' });
+        setTimeout(() => {
+          alarmA.receive({ topic: 'alarmA', command: 'disarm' });
+        }, 60);
+
+        setTimeout(() => {
+          try {
+            expect(seenB).to.include('armed');
+            expect(seenB).to.include('disarmed');
+            done();
+          } catch (err) {
+            done(err);
+          }
+        }, 250);
+      })
+      .catch(done);
+  });
 });

package/tools/alarm-json-mapper.html

@@ -768,13 +768,13 @@
 	      return payload;
 	    }
 
-    function scheduleAutosave(errors) {
-      if (isEditingZoneTable) {
-        if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
-        autoSaveTimer = null;
-        setAutosaveHint("Autosave paused while editing zones.");
-        return;
-      }
+	    function scheduleAutosave(errors) {
+	      if (isEditingZoneTable) {
+	        if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
+	        autoSaveTimer = null;
+	        setAutosaveHint("Autosave paused while editing zones.");
+	        return;
+	      }
       if (!page.alarmNodeId) {
         setAutosaveHint("");
         setConnectionState("disconnected");
@@ -792,12 +792,22 @@
         setAutosaveHint("Autosave paused: fix zone errors to save.");
         return;
       }
-      if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
-      autoSaveTimer = window.setTimeout(() => {
-        autoSaveTimer = null;
-        sendZonesToEditor(true);
-      }, 250);
-    }
+	      if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
+	      autoSaveTimer = window.setTimeout(() => {
+	        autoSaveTimer = null;
+	        sendZonesToEditor(true);
+	      }, 80);
+	    }
+
+	    function flushZonesToEditor(quiet) {
+	      if (!page.alarmNodeId) return;
+	      if (!canTalkToEditor()) return;
+	      const errors = validateModel();
+	      if (errors && errors.length > 0) return;
+	      if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
+	      autoSaveTimer = null;
+	      sendZonesToEditor(quiet !== false);
+	    }
 
 	    function validateModel() {
 	      const errors = [];
@@ -1924,24 +1934,26 @@
       }
     });
 
-    // Track editing state to avoid autosave while typing.
-    els.zoneTableBody.addEventListener("focusin", () => {
-      isEditingZoneTable = true;
-      if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
-      autoSaveTimer = null;
-      setAutosaveHint("Autosave paused while editing zones.");
-    });
-
-    els.zoneTableBody.addEventListener("focusout", () => {
-      setTimeout(() => {
-        const active = document.activeElement;
-        const stillInside =
-          active && els.zoneTableBody && els.zoneTableBody.contains(active);
-        if (stillInside) return;
-        isEditingZoneTable = false;
-        refreshZonesMeta();
-      }, 0);
-    });
+	    // Track editing state to avoid autosave while typing.
+	    els.zoneTableBody.addEventListener("focusin", () => {
+	      isEditingZoneTable = true;
+	      if (autoSaveTimer) window.clearTimeout(autoSaveTimer);
+	      autoSaveTimer = null;
+	      setAutosaveHint("Autosave paused while editing zones.");
+	    });
+
+	    els.zoneTableBody.addEventListener("focusout", () => {
+	      setTimeout(() => {
+	        const active = document.activeElement;
+	        const stillInside =
+	          active && els.zoneTableBody && els.zoneTableBody.contains(active);
+	        if (stillInside) return;
+	        isEditingZoneTable = false;
+	        refreshZonesMeta();
+	        // Flush as soon as the user leaves the zone table, to reduce lost changes.
+	        flushZonesToEditor(true);
+	      }, 0);
+	    });
 
     els.zoneTableBody.addEventListener("click", (evt) => {
       const target = evt.target;
@@ -1996,11 +2008,18 @@
       }
     }
 
-    window.addEventListener("message", (evt) => {
-      if (evt.origin !== page.origin) return;
-      const data = evt.data && typeof evt.data === "object" ? evt.data : null;
-      handleEditorZonesMessage(data);
-    });
+	    window.addEventListener("message", (evt) => {
+	      if (evt.origin !== page.origin) return;
+	      const data = evt.data && typeof evt.data === "object" ? evt.data : null;
+	      handleEditorZonesMessage(data);
+	    });
+
+	    // Best-effort flush on close/navigation away, so edits are not lost if the user closes quickly.
+	    window.addEventListener("beforeunload", () => flushZonesToEditor(true));
+	    window.addEventListener("pagehide", () => flushZonesToEditor(true));
+	    document.addEventListener("visibilitychange", () => {
+	      if (document.hidden) flushZonesToEditor(true);
+	    });
 
     if (bc) {
       bc.addEventListener("message", (evt) => {