node-red-contrib-zwave-js 8.0.0-beta.4 → 8.0.0

package/CHANGELOG.md

@@ -11,6 +11,8 @@
         ]
         ```
         previously this was ```[<number>, <Desired Value>, <Number>]```
+      - **ValueAPI** is now default on the CMD Factory node.
+        If you have problems with this node after the update, please open it up, and select your API, then save.
 
     **New Features**
       - Default scales can now be applied inside the controller config
@@ -19,6 +21,9 @@
       - 2 new event types have been added : **ALIVE**, **DEAD** - these allow you to monitor if a device has been marked dead
         or alive accordingly.
       - Added a color chooser for color input types in the UI
+      - Added a new **Driver** function **getLastEvents**  
+      - Device last seen timestamp is now shown in the UI
+      - Node list now contains the date when the device was last seen.
 
     **Bug Fixes**
       - Modal alerts are now rendering HTML content once again
@@ -30,6 +35,7 @@
       - Current Value(s) who's type is an object have been changed to prompt for a double click in the UI
       - Association Management has been updated, and changes are now applied in batch.
       - For battery operated devices, certain UI actions now ask you to wake up said device before anything is comitted.
+      - Various performance boosts in the UI
       - Bump ZWave JS to V10
       - Bump Winston
       - Bump ESlint

package/package.json

@@ -1,18 +1,18 @@
 {
 	"name": "node-red-contrib-zwave-js",
-	"version": "8.0.0-beta.4",
+	"version": "8.0.0",
 	"license": "MIT",
 	"description": "The most powerful, high performing and highly polished Z-Wave node for Node-RED based on Z-Wave JS. If you want a fully featured Z-Wave framework in your Node-RED instance, you have found it.",
 	"dependencies": {
 		"limiter": "^2.1.0",
 		"lodash": "^4.17.21",
 		"serialport": "^10.4.0",
-		"winston": "^3.8.1",
+		"winston": "^3.8.2",
 		"winston-transport": "^4.5.0",
-		"zwave-js": "^10.0.1"
+		"zwave-js": "^10.2.0"
 	},
 	"devDependencies": {
-		"eslint": "^8.22.0",
+		"eslint": "^8.23.1",
 		"prettier": "^2.7.1"
 	},
 	"scripts": {

package/resources/MeshMap/maprender.js

@@ -27,6 +27,7 @@ function Render(Base) {
 					name: 'Controller',
 					nameOnly: `Controller`,
 					location: `Hopefully away from interference.`,
+					lastSeen: '0',
 					fontSize: '12px',
 					icon: `${Base}/Stick.png`,
 					powerSource: { type: 'bus' },
@@ -52,6 +53,12 @@ function Render(Base) {
 					path: []
 				}
 			};
+			if(N.lastSeen > 0){
+				EL.data.lastSeen = new Date(N.lastSeen).toLocaleString();
+			}
+			else{
+				EL.data.lastSeen = 'Never';
+			}
 
 			Elements.push(EL);
 
@@ -308,6 +315,9 @@ function LoadData() {
 		$(`<li>Timeouts: ${this.data('statistics').timeoutResponse}</li>`).appendTo(
 			NetStatsDetails
 		);
+
+		// Node details addition
+		$(`<li>Last Seen: ${this.data('lastSeen')}</li>`).appendTo(NodeDetails);
 	}
 
 	$('#Details').html(Data);

package/resources/UITab/client.js

@@ -3,7 +3,6 @@
 /*eslint no-undef: "warn"*/
 /*eslint no-unused-vars: "warn"*/
 
-
 /* UI Inclusion Functions */
 let StartInclusionExclusion;
 let StartReplace;
@@ -208,6 +207,11 @@ const DCs = {
 		name: 'getValueMetadata',
 		noWait: false
 	},
+	getValueDB: {
+		API: 'DriverAPI',
+		name: 'getValueDB',
+		noWait: false
+	},
 	getAvailableFirmwareUpdates: {
 		API: 'ControllerAPI',
 		name: 'getAvailableFirmwareUpdates',
@@ -539,6 +543,14 @@ const ZwaveJsUI = (function () {
 	}
 
 	async function PerformUpdate() {
+		const CurrentFWMode = $('#tabs').tabs('option', 'active');
+
+		if (CurrentFWMode === 0) {
+			const SelectedFW = $('#NODE_FWCV').find(':selected').data('FWTarget');
+			PerformUpdateFromService(SelectedFW.node, SelectedFW.file);
+			return;
+		}
+
 		const FE = $('#FILE_FW')[0].files[0];
 		const NID = parseInt($('#NODE_FW option:selected').val());
 		const Target = $('#TARGET_FW').val();
@@ -992,6 +1004,7 @@ const ZwaveJsUI = (function () {
 						const _Node = {
 							controller: N.isControllerNode,
 							nodeId: N.nodeId,
+							lastSeen: N.lastSeen,
 							name: N.name,
 							location: N.location,
 							powerSource: N.powerSource,
@@ -2621,7 +2634,6 @@ const ZwaveJsUI = (function () {
 
 		CheckForUpdate = async () => {
 			const Node = parseInt($('#NODE_FWC option:selected').val());
-
 			const nodeRow = $('#zwave-js-node-list').find(`[data-nodeid='${Node}']`);
 
 			if (nodeRow.data().info.status.toUpperCase() === 'ASLEEP') {
@@ -2631,6 +2643,13 @@ const ZwaveJsUI = (function () {
 				}
 			}
 
+			const Wait = modalPrompt(
+				'Querying Firmware Update Service..',
+				'Please wait...',
+				{},
+				false
+			);
+
 			ControllerCMD(
 				DCs.getAvailableFirmwareUpdates.API,
 				DCs.getAvailableFirmwareUpdates.name,
@@ -2639,86 +2658,54 @@ const ZwaveJsUI = (function () {
 				DCs.getAvailableFirmwareUpdates.noWait
 			)
 				.then(({ object }) => {
+					Wait.dialog('destroy');
+
+					const ShowCL = function () {
+						const SelectedFW = $('#NODE_FWCV')
+							.find(':selected')
+							.data('FWTarget');
+						const List = $('<ul>');
+						for (let i = 0; i < SelectedFW.cl.length; i++) {
+							List.append(`<li>${SelectedFW.cl[i]}</li>`);
+						}
 
-					if (object.length > 0) {
-						$("#FWs").remove();
-						const FWList = $('<div id="FWs">');
-
-						const FWs = object;
-						FWs.forEach((FW) =>{
-							
-							const Current = nodeRow.data().info.firmwareVersion.toString() === FW.version.toString() ? "(Current)" : "";
-
-							FWList.append(`<h3>${FW.version} ${Current}</h3>`);
-							const ChangeLog = FW.changelog.split('\n');
-
-							const Content = $("<div>");
-							const CL = $("<ul>");
-
-							ChangeLog.forEach((CLE) =>{
-								CL.append(`<li>${CLE}</li>`);
-							})
-							Content.append(CL);
-
-							FW.files.forEach((F) =>{
-								const B = $(`<label for="Target_${F.target}">Target ${F.target}</label> <input type="radio" name="fw_target" value="${F.target}" id="Target_${F.target}"> `);
-								B.data('FWTarget',{file:F,node:Node});
-								Content.append(B)
-								//B.checkboxradio();
-							})
-							FWList.append(Content);
-						})
-
-						$(`button:contains('Check For Update')`).parent().append(FWList);
-						FWList.accordion();
-						
-						
-
-						/*
-						//
-						const Container = $('<div>');
-						Container.append(
-							`Current Version <strong>${
-								nodeRow.data().info.firmwareVersion
-							}</strong> New Version <strong>${
-								object[0].version
-							}</strong><br /><br />`
-						);
+						$('#ChangeLog').empty();
+						$('#ChangeLog').append(List);
+					};
 
-						Container.append('<strong>Change Log</strong>');
+					$('#ChangeLog').empty();
+					$('#NODE_FWCV').empty();
+					$('#NODE_FWCV').append('<option>Select Version & File...</option>');
+					$('#NODE_FWCV').off('change');
+					$('#NODE_FWCV').change(ShowCL);
 
-						const CLL = $('<ul>');
-						const ChangeLogs = object[0].changelog.split('\n');
-						ChangeLogs.forEach((CL) => {
-							CLL.append(`<li>${CL.replace(/\n/g, '<br />')}</li>`);
+					//
+					if (object.length > 0) {
+						const FWs = object;
+						FWs.forEach((FW) => {
+							const VG = $(`<optgroup label=' --- ${FW.version} --- '>`);
+							FW.files.forEach((F) => {
+								const FWF = $(`<option>`);
+								FWF.data('FWTarget', {
+									file: F,
+									node: Node,
+									cl: FW.changelog.split('\n')
+								});
+								FWF.text(`${FW.version} -> Target : ${F.target}`);
+								VG.append(FWF);
+							});
+							$('#NODE_FWCV').append(VG);
 						});
-						CLL.appendTo(Container);
-
-						const Buttons = {};
-
-						for (let i = 0; i < object[0].files.length; i++) {
-							const File = object[0].files[i];
-							Buttons[`Update (Target ${File.target})`] = function () {
-								PerformUpdateFromService(Node, File);
-							};
-						}
-
-						modalPrompt(
-							Container,
-							'Firmware Update Available',
-							Buttons,
-							true,
-							true
-						);
-						*/
 					} else {
 						modalAlert(
 							'No firmware updates are available for this Node.',
 							'Firmware update check'
 						);
 					}
+					//
 				})
 				.catch((err) => {
+					Wait.dialog('destroy');
 					modalAlert(
 						err.responseText || err.message,
 						'Could not check for updates'
@@ -3302,6 +3289,17 @@ const ZwaveJsUI = (function () {
 	}
 
 	function renderNode(node) {
+		const NameCol = $('<div>')
+			.html(node.name)
+			.addClass('zwave-js-node-row-name');
+
+		if (node.lastSeen !== 0) {
+			const DT = new Date(node.lastSeen);
+			RED.popover.tooltip(NameCol, `Last seen: ${DT.toLocaleString()}`);
+		} else {
+			RED.popover.tooltip(NameCol, `Last seen: Never`);
+		}
+
 		return $('<div>')
 			.addClass('red-ui-treeList-label zwave-js-node-row')
 			.attr('data-nodeid', node.nodeId)
@@ -3332,7 +3330,7 @@ const ZwaveJsUI = (function () {
 			})
 			.append(
 				$('<div>').html(node.nodeId).addClass('zwave-js-node-row-id'),
-				$('<div>').html(node.name).addClass('zwave-js-node-row-name'),
+				NameCol,
 				$('<div>')
 					.html(renderStatusIcon(node.status.toUpperCase()))
 					.addClass('zwave-js-node-row-status'),
@@ -3510,13 +3508,13 @@ const ZwaveJsUI = (function () {
 		updateNodeFetchStatus('Fetching properties...');
 
 		ControllerCMD(
-			DCs.getDefinedValueIDs.API,
-			DCs.getDefinedValueIDs.name,
-			selectedNode,
+			DCs.getValueDB.API,
+			DCs.getValueDB.name,
 			undefined,
-			DCs.getDefinedValueIDs.noWait
+			[selectedNode],
+			DCs.getValueDB.noWait
 		)
-			.then(({ object }) => buildPropertyTree(object))
+			.then(({ object }) => buildPropertyTree(object[0].values))
 			.catch((err) => {
 				modalAlert(
 					err.responseText || err.message,
@@ -3542,27 +3540,50 @@ const ZwaveJsUI = (function () {
 		}
 		updateNodeFetchStatus('');
 
-		// Step 1: Make list of all supported command classes
-		const data = uniqBy(valueIdList, 'commandClass')
-			.sort((a, b) => a.commandClassName.localeCompare(b.commandClassName))
-			.map(({ commandClass, commandClassName }) => {
-				// Step 2: For each CC, get all associated properties
-				const propsInCC = valueIdList.filter(
-					(valueId) => valueId.commandClass === commandClass
-				);
-
-				return {
-					element: renderCommandClassElement(commandClass, commandClassName),
-					expanded: false,
-					children: propsInCC.map((valueId) => {
-						return { element: renderPropertyElement(valueId) };
-					})
-				};
+		const CCList = uniqBy(valueIdList, 'commandClass');
+		CCList.sort((a, b) => a.commandClassName.localeCompare(b.commandClassName));
+
+		const Data = [];
+		CCList.forEach((CC) => {
+			Data.push({
+				element: renderCommandClassElement(
+					CC.commandClass,
+					CC.commandClassName
+				),
+				expanded: false,
+				children: []
 			});
+		});
 
-		// Step 3: Render tree
 		const propertyList = $('#zwave-js-node-properties');
-		propertyList.treeList('data', data);
+		propertyList.treeList('data', Data);
+
+		let Index = 0;
+		CCList.forEach((V) => {
+			const CCProps = valueIdList.filter(
+				(VID) => VID.commandClass === V.commandClass
+			);
+			CCProps.forEach((Prop) => {
+				const Type = Prop.metadata.type;
+				const Writeable = Prop.metadata.writeable;
+				const CV = Prop.currentValue;
+
+				const Child = renderPropertyElement(Prop);
+				propertyList
+					.treeList('data')
+					[Index].treeList.addChild({ element: Child });
+
+				if (Writeable && Type !== 'any') {
+					const icon = Child.prev();
+					icon.empty();
+					$('<i>')
+						.addClass('fa fa-pencil zwave-js-node-property-edit-button')
+						.click(() => showEditor(Prop, CV))
+						.appendTo(icon);
+				}
+			});
+			Index++;
+		});
 
 		// Step 4: Add endpoint numbers where applicable
 		propertyList
@@ -3619,7 +3640,25 @@ const ZwaveJsUI = (function () {
 		return el;
 	}
 
+	function splitObject(valueId) {
+		// delete normalizedObject
+		delete valueId.normalizedObject;
+
+		// Value
+		const Value = valueId.currentValue;
+		delete valueId.currentValue;
+
+		// Meta
+		const MetaData = JSON.parse(JSON.stringify(valueId.metadata));
+		delete valueId.metadata;
+
+		return { valueId: valueId, currentValue: Value, metadata: MetaData };
+	}
+
 	function renderPropertyElement(valueId) {
+		const Split = splitObject(valueId);
+		valueId = Split.valueId;
+
 		const el = $('<div>')
 			.addClass('zwave-js-node-property')
 			.attr('data-endpoint', valueId.endpoint)
@@ -3640,7 +3679,7 @@ const ZwaveJsUI = (function () {
 			.text(label)
 			.appendTo(el);
 		$('<span>').addClass('zwave-js-node-property-value').appendTo(el);
-		getValue(valueId);
+		getValue(valueId, Split.metadata, Split.currentValue, el);
 		el.dblclick(function () {
 			const data = $(this).data();
 			const valueData = $(this).find('.zwave-js-node-property-value').data();
@@ -3679,44 +3718,12 @@ const ZwaveJsUI = (function () {
 		return el;
 	}
 
-	function getValue(valueId) {
-		ControllerCMD(
-			DCs.getValue.API,
-			DCs.getValue.name,
-			selectedNode,
-			[valueId],
-			DCs.getValue.noWait
-		)
-			.then(({ node, object }) => {
-				if (node != selectedNode) {
-					return;
-				}
-				updateValue({ ...valueId, currentValue: object.currentValue });
-				ControllerCMD(
-					DCs.getValueMetadata.API,
-					DCs.getValueMetadata.name,
-					selectedNode,
-					[valueId],
-					DCs.getValueMetadata.noWait
-				)
-					.then(({ node, object }) => {
-						if (!object.metadata || node != selectedNode) {
-							return;
-						}
-						updateMeta(valueId, object.metadata);
-					})
-					.catch((err) => {
-						modalAlert(
-							err.responseText || err.message,
-							'Could not fetch value Metadata.'
-						);
-						throw new Error(err.responseText || err.message);
-					});
-			})
-			.catch((err) => {
-				modalAlert(err.responseText || err.message, 'Could not fetch value.');
-				throw new Error(err.responseText || err.message);
-			});
+	function getValue(valueId, metadata, currentValue, el) {
+		updateValue({ ...valueId, currentValue }, el);
+		if (metadata === undefined) {
+			return;
+		}
+		updateMeta(valueId, metadata, el);
 	}
 
 	function handleBattery(topic, data) {
@@ -3753,9 +3760,9 @@ const ZwaveJsUI = (function () {
 		}
 	}
 
-	function updateValue(valueId) {
+	function updateValue(valueId, El) {
 		// Assumes you already checked if this applies to selectedNode
-		const propertyRow = getPropertyRow(valueId);
+		const propertyRow = El || getPropertyRow(valueId);
 
 		if (!propertyRow) {
 			// AHHH!!! What do we do now?!
@@ -3828,10 +3835,10 @@ const ZwaveJsUI = (function () {
 		propertyValue.data('value', value);
 	}
 
-	function updateMeta(valueId, meta = {}) {
+	function updateMeta(valueId, meta = {}, El) {
 		// Assumes you already checked if this applies to selectedNode
 
-		const propertyRow = getPropertyRow(valueId);
+		const propertyRow = El || getPropertyRow(valueId);
 		const propertyValue = propertyRow.find('.zwave-js-node-property-value');
 
 		propertyRow.data('meta', meta);
@@ -3855,14 +3862,15 @@ const ZwaveJsUI = (function () {
 			propertyValue.text(`${value} ${meta.unit}`);
 		}
 
-		// Add "edit" icon, if applicable
-		const icon = propertyRow.prev();
-		icon.empty();
-		if (meta.writeable && meta.type !== 'any')
-			$('<i>')
-				.addClass('fa fa-pencil zwave-js-node-property-edit-button')
-				.click(() => showEditor(valueId, value))
-				.appendTo(icon);
+		if (El === undefined) {
+			const icon = propertyRow.prev();
+			icon.empty();
+			if (meta.writeable && meta.type !== 'any')
+				$('<i>')
+					.addClass('fa fa-pencil zwave-js-node-property-edit-button')
+					.click(() => showEditor(valueId, value))
+					.appendTo(icon);
+		}
 	}
 
 	function showEditor(valueId, value) {

package/resources/UITab/styles.css

@@ -166,6 +166,7 @@
 	border-color: rgb(75, 75, 75);
 	border-style: solid;
 }
+
 .zwave-js-ac i {
 	font-size: 16px !important;
 	color: #666;
@@ -216,7 +217,7 @@
 	margin-top: 50px;
 }
 
-.progressbar > div {
+.progressbar>div {
 	background-color: gray;
 	width: 0%;
 	height: 20px;
@@ -302,3 +303,16 @@ table#zwave-js-associations-table tr:first-of-type {
 .ui-slider-range {
 	background: rgba(200, 200, 200, 0.3);
 }
+
+#FWForm #tabs ul {
+	background-color: #fff !important;
+}
+
+#FWForm #tabs ul li.ui-tabs-active {
+	background-color: #fff !important;
+}
+
+#FWForm #tabs ul li.ui-tabs-active a {
+	color: #555 !important;
+	font-weight: bold !important;
+}

package/validation_result.json

@@ -1 +1 @@
-{"package":{"name":"node-red-contrib-zwave-js","version":"8.0.0"},"P01":{"test":true,"license":"MIT"},"P03":{"test":true},"P04":{"test":true},"P08":{"test":true},"P05":{"test":true},"P06":{"test":true,"versions":["3.0.1"]},"P07":{"test":false,"version":">=14.13.0"},"N01":{"test":true},"N02":{"test":true,"nodes":["zwave-js","zwave-device","event-filter","cmd-factory"]},"D01":{"test":true,"total":6},"D02":{"test":true},"D03":{"test":true}}
+{"package":{"name":"node-red-contrib-zwave-js","version":"8.0.0"},"P01":{"test":true,"license":"MIT"},"P03":{"test":true},"P04":{"test":true},"P08":{"test":true},"P05":{"test":true},"P06":{"test":true,"versions":["3.0.2","2.2.3"]},"P07":{"test":false,"version":">=14.13.0"},"N01":{"test":true},"N02":{"test":true,"nodes":["zwave-js","zwave-device","event-filter","cmd-factory"]},"D01":{"test":true,"total":6},"D02":{"test":true},"D03":{"test":true}}

package/zwave-js/zwave-js.html

@@ -726,16 +726,17 @@
 	>
 	<div id="tabs">
 		<ul>
-			<li><a href="#tabs-1">Local File</a></li>
-			<li><a href="#tabs-2">Firmware Update Service</a></li>
-		  </ul>
-		  <div id="tabs-1" style="padding:20px">
+			<li><a href="#tabs-1">Firmware Update Service</a></li>
+			<li><a href="#tabs-2">Local File</a></li>
+
+		</ul>
+		<div id="tabs-1" style="padding:20px">
 			<table>
 				<tbody>
 					<tr>
 						<td>Target Node</td>
 						<td>
-							<select id='NODE_FW'>
+							<select id='NODE_FWC' onchange="CheckForUpdate()">
 								<option>Select Node...</option>
 								{{#each nodes}}
 									{{#if this.length}}
@@ -750,25 +751,24 @@
 						</td>
 					</tr>
 					<tr>
-						<td>Firmware Update Target</td>
+						<td>Firmware Version</td>
 						<td>
-							<input type='number' value='0' min='0' id='TARGET_FW' />
+							<select id='NODE_FWCV'>
+								<option>Select Version & File...</option>
+							</select>
 						</td>
 					</tr>
-					<tr>
-						<td>Firmware Update File</td>
-						<td><input type='file' id='FILE_FW' /></td>
-					</tr>
 				</tbody>
 			</table>
-		  </div>
+			<div id="ChangeLog"></div>
+		</div>
 		  <div id="tabs-2" style="padding:20px">
 			<table>
 				<tbody>
 					<tr>
 						<td>Target Node</td>
 						<td>
-							<select id='NODE_FWC'>
+							<select id='NODE_FW'>
 								<option>Select Node...</option>
 								{{#each nodes}}
 									{{#if this.length}}
@@ -783,16 +783,18 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2"><button
-							button
-							style='width:150px; height:30px'
-							class='ui-button ui-corner-all ui-widget SecrutiyButton CriticalDisable'
-							onclick='CheckForUpdate()'
-						>Check For Update</button></td>
+						<td>Firmware Update Target</td>
+						<td>
+							<input type='number' value='0' min='0' id='TARGET_FW' />
+						</td>
+					</tr>
+					<tr>
+						<td>Firmware Update File</td>
+						<td><input type='file' id='FILE_FW' /></td>
 					</tr>
 				</tbody>
 			</table>
-		</div>
+		  </div>
 	</div>
 	
 		<div class='progressbar' id='FWProgress'><div></div></div>

package/zwave-js/zwave-js.js

@@ -57,7 +57,7 @@ module.exports = function (RED) {
 		'heal network progress'
 	);
 	const FWK =
-		'ceb8fd78b90cceb4d64cddec000630b7d692ac44e2daa0bd6e75047bdce05c7bae3b3925ef8e3e833419f593e62fe8f0';
+		'127c49b6f2928a6579e82ecab64a83fc94a6436f03d5cb670b8ac44412687b75f0667843';
 
 	SetupGlobals(RED);
 
@@ -1028,6 +1028,7 @@ module.exports = function (RED) {
 							isControllerNode: N.isControllerNode,
 							supportsBeaming: N.supportsBeaming,
 							keepAwake: N.keepAwake,
+							lastSeen: N.ZWNR_lastSeen || 0,
 							powerSource: {
 								type: N.supportsCC(CommandClasses.Battery)
 									? 'battery'
@@ -1402,6 +1403,25 @@ module.exports = function (RED) {
 			);
 
 			switch (Method) {
+				case 'getLastEvents':
+					const PL = [];
+					Driver.controller.nodes.forEach((N) => {
+						if(N.isControllerNode){
+							return;
+						}
+						const I = {
+							node: N.id,
+							nodeName: getNodeInfoForPayload(N.id, 'name'),
+							nodeLocation: getNodeInfoForPayload(N.id, 'location'),
+							timestamp: N.ZWNR_lastSeen || 0,
+							event: N.ZWNR_lastEvent,
+							object: N.ZWNR_lastObject
+						};
+						PL.push(I);
+					});
+					Send(undefined, 'LAST_EVENTS_RESULT', PL, send);
+					break;
+
 				case 'checkLifelineHealth':
 					const NID = Params[0];
 					const Rounds = Params[1] || undefined;
@@ -1472,12 +1492,14 @@ module.exports = function (RED) {
 						};
 						const VIDs = Driver.controller.nodes.get(NID).getDefinedValueIDs();
 						VIDs.forEach((VID) => {
+							const M = Driver.controller.nodes.get(NID).getValueMetadata(VID);
 							const V = Driver.controller.nodes.get(NID).getValue(VID);
 							const VI = {
 								...VID,
 								currentValue: V
 							};
 							VI.normalizedObject = buildNormalized(VI, NID);
+							VI.metadata = M;
 							G.values.push(VI);
 						});
 						Result.push(G);
@@ -1828,6 +1850,20 @@ module.exports = function (RED) {
 				'GET_VALUE_METADATA_RESPONSE'
 			];
 
+			const TimestampSubjects = [
+				'VALUE_NOTIFICATION',
+				'NOTIFICATION',
+				'VALUE_UPDATED',
+				'WAKE_UP',
+				'ALIVE'
+			];
+
+			if (TimestampSubjects.includes(Subject)) {
+				Driver.controller.nodes.get(Node.id).ZWNR_lastSeen = PL.timestamp;
+				Driver.controller.nodes.get(Node.id).ZWNR_lastEvent = PL.event;
+				Driver.controller.nodes.get(Node.id).ZWNR_lastObject = PL.object;
+			}
+
 			if (AllowedSubjectsForDNs.includes(Subject) && SendDNs) {
 				if (IsolatedNodeId !== undefined) {
 					Log(