isy-nodejs 1.0.1-alpha.2 → 1.0.1-alpha.21

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -7,6 +7,7 @@ import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 import type { OnOffBehavior } from '@project-chip/matter.js/behaviors/on-off';
 import 'winston';
+import { RelayLampSwitch } from './RelayLampSwitch.js';
 import type { Command } from '../../Definitions/Global/Commands.js';
 import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import { UnitOfMeasure } from '../../Definitions/index.js';
@@ -14,14 +15,11 @@ import { Properties } from '../../ISYConstants.js';
 
 import type { DriverState } from '../../Model/DriverState.js';
 
-export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR'>, Command.Signatures<'DON' | 'DOF'>> {
+export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice<Driver.Signatures<'ST' | 'OL' | 'RR' | 'ERR'>, Command.Signatures<'DON' | 'DOF'>>*/ {
 	// #region Constructors (1)
 
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create('ST', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
-		this.drivers.OL = Driver.create('OL', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'On Level', name: 'onLevel' });
-		this.drivers.RR = Driver.create('RR', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Ramp Rate', name: 'rampRate' });
 	}
 
 	// #endregion Constructors (1)
@@ -57,7 +55,7 @@ export class InsteonRelayDevice extends InsteonBaseDevice<Driver.Signatures<'ST'
 
 	} */
 	public override async sendBeep(level: number = 100): Promise<any> {
-		return super.sendBeep(level);
+		return super.beep(level);
 	}
 
 	// #endregion Public Methods (2)

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -0,0 +1,131 @@
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
+import { UnitOfMeasure } from "../../Definitions/Global/UOM.js";
+import { Family } from "../../Definitions/Global/Families.js";
+import type { NodeInfo } from "../../Model/NodeInfo.js";
+import type { ISY } from "../../ISY.js";
+import type { ISYNode } from "../../ISYNode.js";
+import { InsteonBaseDevice } from "./InsteonBaseDevice.js";
+import { ISYDeviceNode } from "../ISYDeviceNode.js";
+import { Driver } from "../../Definitions/Global/Drivers.js";
+import { Insteon } from "../../Definitions/index.js";
+import type { DriverState } from "../../Model/DriverState.js";
+import { NodeFactory } from "../NodeFactory.js";
+
+export const nodeDefId = "RelayLampSwitch";
+
+type Commands = RelayLampSwitch.Commands;
+type Drivers = RelayLampSwitch.Drivers;
+
+export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> implements RelayLampSwitch.Interface {
+	public override readonly commands = {
+		DON: this.on,
+		DOF: this.off,
+		DFOF: this.fastOff,
+		DFON: this.fastOn,
+		QUERY: this.query,
+		BEEP: this.beep,
+		BL: this.backlight,
+		WDU: this.writeChanges
+	};
+	static override nodeDefId = 'RelayLampSwitch';
+	declare readonly nodeDefId: 'RelayLampSwitch';
+	constructor(isy: ISY, nodeInfo: NodeInfo) {
+		super(isy, nodeInfo);
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
+	}
+	async on(value?: 0 | 100) {
+		return this.sendCommand('DON', { value: value });
+	}
+	async off() {
+		return this.sendCommand('DOF');
+	}
+	async fastOff() {
+		return this.sendCommand('DFOF');
+	}
+	async fastOn() {
+		return this.sendCommand('DFON');
+	}
+	async query() {
+		return this.sendCommand('QUERY');
+	}
+	async beep(value?: number) {
+		return this.sendCommand('BEEP', { value: value });
+	}
+	async backlight(value: number) {
+		return this.sendCommand('BL', { value: value });
+	}
+	async writeChanges() {
+		return this.sendCommand('WDU');
+	}
+	public get status(): Insteon.OnLevelRelay {
+		return this.drivers.ST?.value;
+	}
+	public get responding(): Insteon.Error {
+		return this.drivers.ERR?.value;
+	}
+}
+
+NodeFactory.register(RelayLampSwitchNode);
+
+export namespace RelayLampSwitch {
+	export interface Interface extends Omit<InstanceType<typeof RelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
+		nodeDefId: "RelayLampSwitch";
+	}
+	export function is(node: ISYNode<any, any, any, any>): node is RelayLampSwitchNode {
+		return node.nodeDefId === nodeDefId;
+	}
+	export function create(isy: ISY, nodeInfo: NodeInfo) {
+		return new RelayLampSwitchNode(isy, nodeInfo);
+	}
+	export const Node = RelayLampSwitchNode;
+	export type Commands = {
+		DON: ((value?: (0 | 100)) => Promise<boolean>) & {
+			label: "On";
+			name: "on";
+		};
+		DOF: (() => Promise<boolean>) & {
+			label: "Off";
+			name: "off";
+		};
+		DFOF: (() => Promise<boolean>) & {
+			label: "Fast Off";
+			name: "fastOff";
+		};
+		DFON: (() => Promise<boolean>) & {
+			label: "Fast On";
+			name: "fastOn";
+		};
+		QUERY: (() => Promise<boolean>) & {
+			label: "Query";
+			name: "query";
+		};
+		BEEP: ((value?: number) => Promise<boolean>) & {
+			label: "Beep";
+			name: "beep";
+		};
+		BL: ((value: number) => Promise<boolean>) & {
+			label: "Backlight";
+			name: "backlight";
+		};
+		WDU: (() => Promise<boolean>) & {
+			label: "Write Changes";
+			name: "writeChanges";
+		};
+	};
+	export type Drivers = {
+		ST: {
+			uom: UnitOfMeasure.Percent;
+			value: Insteon.OnLevelRelay;
+			label: "Status";
+			name: "status";
+		};
+		ERR: {
+			uom: UnitOfMeasure.Index;
+			value: Insteon.Error;
+			label: "Responding";
+			name: "responding";
+		};
+	};
+}

package/src/ISY.ts

@@ -3,14 +3,12 @@ import { writeFile } from 'fs';
 
 import { Parser, type ParserOptions } from 'xml2js';
 import { parseBooleans, parseNumbers } from 'xml2js/lib/processors.js';
-import { XmlDocument } from 'xmldoc';
 
 import axios from 'axios';
 import { EventEmitter } from 'events';
-import winston, { format, Logger, loggers, type LeveledLogMethod } from 'winston';
+import { format, Logger, loggers } from 'winston';
 import { Category } from './Definitions/Global/Categories.js';
 import { Family } from './Definitions/Global/Families.js';
-import type { NodeInfo } from './Model/NodeInfo.js';
 import { DeviceFactory } from './Devices/DeviceFactory.js';
 import { ELKAlarmPanelDevice } from './Devices/Elk/ElkAlarmPanelDevice.js';
 import { ElkAlarmSensorDevice } from './Devices/Elk/ElkAlarmSensorDevice.js';
@@ -31,18 +29,22 @@ import { InsteonOnOffOutletDevice } from './Devices/Insteon/InsteonOnOffOutletDe
 import { InsteonRelayDevice } from './Devices/Insteon/InsteonRelayDevice.js';
 import { InsteonSmokeSensorDevice } from './Devices/Insteon/InsteonSmokeSensorDevice.js';
 import { InsteonThermostatDevice } from './Devices/Insteon/InsteonThermostatDevice.js';
+import { ISYDeviceNode } from './Devices/ISYDeviceNode.js';
 import { EventType } from './Events/EventType.js';
 import { NodeType, Props, States, VariableType } from './ISYConstants.js';
-import { ISYNode } from './ISYNode.js';
-import { ISYDeviceNode } from './Devices/ISYDeviceNode.js';
 import { type ISYDevice } from './ISYDevice.js';
+import { ISYNode } from './ISYNode.js';
 import { ISYScene } from './ISYScene.js';
 import { ISYVariable } from './ISYVariable.js';
+import type { NodeInfo } from './Model/NodeInfo.js';
 
 import * as Utils from './Utils.js';
 
 import { X2jOptions, XMLParser } from 'fast-xml-parser';
 import { NodeFactory } from './Devices/NodeFactory.js';
+import type { Config } from './Model/Config.js';
+import { findPackageJson } from './Utils.js';
+import path from 'path';
 
 export {
 	Category as Categories,
@@ -118,6 +120,21 @@ const parser = new Parser(defaultParserOptions);
 
 export let Controls = {};
 
+interface ISYConfig {
+	// #region Properties (8)
+
+	displayNameFormat?: string;
+	elkEnabled?: boolean;
+	enableWebSocket?: boolean;
+	host: string;
+	password: string;
+	port: number;
+	protocol: 'http' | 'https';
+	username: string;
+
+	// #endregion Properties (8)
+}
+
 export class ISY extends EventEmitter implements Disposable {
 	// #region Properties (30)
 
@@ -140,7 +157,7 @@ export class ISY extends EventEmitter implements Disposable {
 
 	public static instance: ISY;
 
-	public configInfo: any;
+	public configInfo: Config;
 	public elkAlarmPanel: ELKAlarmPanelDevice;
 	public guardianTimer: any;
 	public id: string;
@@ -150,29 +167,19 @@ export class ISY extends EventEmitter implements Disposable {
 	public nodesLoaded: boolean = false;
 	public productId = 5226;
 	public productName = 'eisy';
-	public serverVersion: any;
+	public firmwareVersion: any;
 	public vendorName = 'Universal Devices, Inc.';
 	public webSocket: WebSocket.Client;
 
+	public apiVersion: string;
+
 	// #endregion Properties (30)
 
 	// #region Constructors (1)
 
-	constructor(
-		config: {
-			host: string;
-			port: number;
-			protocol: 'http' | 'https';
-			username: string;
-			password: string;
-			enableWebSocket?: boolean;
-			displayNameFormat?: string;
-			elkEnabled?: boolean;
-		},
-		logger: Logger = new Logger(),
-		storagePath?: string
-	) {
+	constructor(config: ISYConfig, logger: Logger = new Logger(), storagePath?: string) {
 		super();
+
 		this.enableWebSocket = config.enableWebSocket ?? true;
 		this.storagePath = storagePath ?? './';
 		this.displayNameFormat = config.displayNameFormat ?? '${location ?? folder} ${spokenName ?? name}';
@@ -218,7 +225,11 @@ export class ISY extends EventEmitter implements Disposable {
 
 	// #endregion Public Getters And Setters (2)
 
-	// #region Public Methods (22)
+	// #region Public Methods (24)
+
+	[Symbol.dispose](): void {
+		this.close();
+	}
 
 	public override emit(event: 'InitializeCompleted' | 'NodeAdded' | 'NodeRemoved' | 'NodeChanged', node?: ISYNode<any, any, any, any>): boolean {
 		return super.emit(event, node);
@@ -239,6 +250,10 @@ export class ISY extends EventEmitter implements Disposable {
 		return s as T;
 	}
 
+	public getElkAlarmPanel() {
+		return this.elkAlarmPanel;
+	}
+
 	public getNode<T extends ISYNode<any, any, any, any> = ISYNode<any, any, any, any>>(address: string, parentsOnly = false): T {
 		let s = this.nodeMap.get(address);
 		if (!parentsOnly) {
@@ -254,10 +269,6 @@ export class ISY extends EventEmitter implements Disposable {
 		return s as T;
 	}
 
-	public getElkAlarmPanel() {
-		return this.elkAlarmPanel;
-	}
-
 	public getScene(address: string) {
 		return this.sceneList.get(address);
 	}
@@ -275,7 +286,7 @@ export class ISY extends EventEmitter implements Disposable {
 	}
 
 	public async handleInitializeError(step: string, reason: any): Promise<any> {
-		this.logger.error(`Error initializing ISY (${step}): ${JSON.stringify(reason)}`);
+		this.logger.error(`Error initializing ISY (${step}): ${Utils.logStringify(reason)}`);
 		return Promise.reject(reason);
 	}
 
@@ -323,7 +334,7 @@ export class ISY extends EventEmitter implements Disposable {
 					}
 					break;
 				case EventType.Heartbeat:
-					this.logger.debug(`Received ${EventType[Number(stringControl)]} Signal from ISY: ${JSON.stringify(evt)}`);
+					this.logger.debug(`Received ${EventType[Number(stringControl)]} Signal from ISY: ${Utils.logStringify(evt)}`);
 					break;
 
 				default:
@@ -331,15 +342,19 @@ export class ISY extends EventEmitter implements Disposable {
 						//
 						const impactedDevice = this.getNode(evt.node);
 						if (impactedDevice !== undefined && impactedDevice !== null) {
-							impactedDevice.handleEvent(evt);
+							try {
+								impactedDevice.handleEvent(evt);
+							} catch (e) {
+								this.logger.error(`Error handling event for ${impactedDevice.name}: ${e.message}`);
+							}
 						} else {
-							this.logger.warn(`${EventType[stringControl]} Event for Unidentified Device: ${JSON.stringify(evt)}`);
+							this.logger.debug(`${EventType[stringControl]} Event for Unidentified Device: ${JSON.stringify(evt)}`);
 						}
 					} else {
 						if (stringControl === EventType.NodeChanged) {
-							this.logger.info(`Received Node Change Event: ${JSON.stringify(evt)}. These are currently unsupported.`);
+							this.logger.debug(`Received Node Change Event: ${JSON.stringify(evt)}. These are currently unsupported.`);
 						}
-						this.logger.debug(`${EventType[Number(stringControl)]} Event: ${JSON.stringify(evt)}`);
+						this.logger.debug(`${EventType[Number(stringControl)]} Event: ${Utils.logStringify(evt)}`);
 					}
 
 					break;
@@ -350,6 +365,7 @@ export class ISY extends EventEmitter implements Disposable {
 	public async initialize(): Promise<any> {
 		const that = this;
 		try {
+			this.apiVersion = (await findPackageJson()).version;
 			await this.loadConfig();
 			await this.loadNodes();
 			await this.loadVariables(VariableType.Integer);
@@ -413,19 +429,18 @@ export class ISY extends EventEmitter implements Disposable {
 	public async loadConfig(): Promise<any> {
 		try {
 			this.logger.info('Loading ISY Config');
-			const configuration = (await this.sendRequest('config')).configuration;
+			const configuration = (await this.sendRequest('config')).configuration as Config;
 			if (this.isDebugEnabled) {
-				writeFile(this.storagePath + '/ISYConfigDump.json', JSON.stringify(configuration), this.logger.error);
+				writeFile(path.resolve(this.storagePath, 'ISYConfigDump.json'), JSON.stringify(configuration), this.logger.error);
 			}
 
 			const controls = configuration.controls;
 			this.model = configuration.deviceSpecs.model;
-			this.serverVersion = configuration.app_version;
+			this.firmwareVersion = configuration.app_full_version;
 			this.vendorName = configuration.deviceSpecs.make;
 			this.productId = configuration.product.id;
 			this.productName = configuration.product.desc;
 			this.id = configuration.root.id;
-			// TODO: Check Installed Features
 			// this.logger.info(result.configuration);
 			if (controls !== undefined) {
 				// this.logger.info(controls.control);
@@ -474,7 +489,9 @@ export class ISY extends EventEmitter implements Disposable {
 		}
 	}
 
-	public override on(event: 'InitializeCompleted' | 'NodeAdded' | 'NodeRemoved' | 'NodeChanged', listener: (node?: ISYNode<any, any, any, any>) => void): this {
+	public override on(event: 'initializeCompleted', listener: () => void): this;
+	public override on(event: 'nodeAdded' | 'nodeRemoved' | 'nodeChanged', listener: (node?: ISYNode<any, any, any, any>) => void): this;
+	override on(event: 'initializeCompleted' | 'nodeAdded' | 'nodeRemoved' | 'nodeChanged', listener: (node?: ISYNode<any, any, any, any>) => void): this {
 		return super.on(event, listener);
 	}
 
@@ -565,12 +582,13 @@ export class ISY extends EventEmitter implements Disposable {
 			trailingSlash: boolean;
 			requestLogLevel?: any;
 			responseLogLevel?: any;
+			errorLogLevel?: any;
 		} = { trailingSlash: true }
 	): Promise<any> {
-		const requestLogLevel = options.requestLogLevel ?? winston.config.cli.levels.debug;
-		const responseLogLevel = options.responseLogLevel ?? winston.config.cli.levels.silly;
+		const requestLogLevel = options.requestLogLevel ?? 'debug';
+		const responseLogLevel = options.responseLogLevel ?? 'silly';
 		url = `${this.protocol}://${this.address}/rest/${url}${options.trailingSlash ? '/' : ''}`;
-		this.logger.log(`Sending request: ${url}`, requestLogLevel);
+		this.logger.log(requestLogLevel, `Sending request: ${url}`);
 		try {
 			const response = await axios.get(url, {
 				auth: { username: this.credentials.username, password: this.credentials.password }
@@ -581,19 +599,22 @@ export class ISY extends EventEmitter implements Disposable {
 					if (options.parserOptions) curParser = new Parser({ ...defaultParserOptions, ...options.parserOptions });
 					var altParser = new XMLParser(defaultXMLParserOptions);
 					var s = altParser.parse(response.data);
-					this.logger.log(`Response: ${JSON.stringify(s)}`, requestLogLevel ?? 'debug');
+					this.logger.log(requestLogLevel ?? 'debug', `Response: ${JSON.stringify(s)}`);
 					return s;
 				} else if (response.headers['content-type'].toString().includes('json')) {
-					this.logger.log(`Response: ${JSON.stringify(response.data)}`, requestLogLevel ?? 'debug');
+					this.logger.log(responseLogLevel ?? 'debug', `Response: ${JSON.stringify(response.data)}`);
 					return JSON.parse(response.data);
 				} else {
-					this.logger.log(`Response Header: ${JSON.stringify(response.headers)} Response: ${JSON.stringify(response.data)}`, responseLogLevel ?? 'debug');
+					this.logger.log(responseLogLevel ?? 'debug', `Response Header: ${JSON.stringify(response.headers)} Response: ${JSON.stringify(response.data)}`);
 					return response.data;
 				}
 			}
 		} catch (error) {
-			this.logger.error(`Error sending request to ISY: ${error?.message}`);
-			throw new Error(`Error sending request to ISY: ${JSON.stringify(error)}`);
+			if (options.errorLogLevel) {
+				this.logger.log(options.errorLogLevel, `Error sending request to ISY: ${error?.message}`);
+			} else {
+				this.logger.error(`Error sending request to ISY: ${error?.message}`);
+			}
 		}
 	}
 
@@ -604,11 +625,19 @@ export class ISY extends EventEmitter implements Disposable {
 		return this.sendRequest(uriToUse);
 	}
 
-	public variableChangedHandler(variable: { id: string; type: string }) {
+	#variableChangedHandler(variable: { id: string; type: string }) {
 		this.logger.info(`Variable: ${variable.id} (${variable.type}) changed`);
 	}
 
-	// #endregion Public Methods (22)
+	public close() {
+		try {
+			this.webSocket?.close();
+		} catch (e) {
+			this.logger.error(`Error closing websocket: ${e.message}`);
+		}
+	}
+
+	// #endregion Public Methods (24)
 
 	// #region Private Methods (11)
 
@@ -645,12 +674,13 @@ export class ISY extends EventEmitter implements Disposable {
 		}
 	}
 
-	#guardian() {
+	async #guardian() {
 		const timeNow = new Date();
 
 		if (Number(timeNow) - Number(this.lastActivity) > 60000) {
 			this.logger.info('Guardian: Detected no activity in more then 60 seconds. Reinitializing web sockets');
-			this.initializeWebSocket();
+			await this.refreshStatuses();
+			await this.initializeWebSocket();
 		}
 	}
 
@@ -681,17 +711,17 @@ export class ISY extends EventEmitter implements Disposable {
 		});
 	}
 
-	#loadElkNodes(result: any) {
+	/* #loadElkNodes(result: any) {
 		const document = new XmlDocument(result);
 		const nodes = document.childNamed('areas').childNamed('area').childrenNamed('zone');
 		for (let index = 0; index < nodes.length; index++) {
 			const id = nodes[index].attr.id;
 			const name = nodes[index].attr.name;
 			const alarmDef = nodes[index].attr.alarmDef;
-			const newDevice = new ElkAlarmSensorDevice(this, name, 1, id /*TODO: Handle CO Sensor vs. Door/Window Sensor */);
+			const newDevice = new ElkAlarmSensorDevice(this, name, 1, id TODO: Handle CO Sensor vs. Door/Window Sensor );
 			this.zoneMap[newDevice.zone] = newDevice;
 		}
-	}
+	} */
 
 	async #readDeviceNodes(obj: { nodes: { node: NodeInfo[] } }) {
 		this.logger.info('Loading Device Nodes');
@@ -762,7 +792,7 @@ export class ISY extends EventEmitter implements Disposable {
 		this.logger.info('Loading Folder Nodes');
 		if (result?.nodes?.folder) {
 			for (const folder of result.nodes.folder) {
-				this.logger.info(`Loading Folder Node: ${JSON.stringify(folder)}`);
+				this.logger.debug(`Loading Folder Node: ${JSON.stringify(folder)}`);
 				this.folderMap.set(folder.address, folder.name);
 			}
 		}
@@ -798,13 +828,9 @@ export class ISY extends EventEmitter implements Disposable {
 		}
 	}
 
-	[Symbol.dispose](): void {
-		try {
-			this.webSocket.close();
-		} catch (e) {
-			this.logger.error(`Error closing websocket: ${e.message}`);
-		}
-	}
-
 	// #endregion Private Methods (11)
 }
+
+export namespace ISY {
+	export interface Config extends ISYConfig {}
+}

package/src/ISYNode.ts

@@ -6,7 +6,7 @@ import { UnitOfMeasure } from './Definitions/Global/UOM.js';
 import { ISY, NodeType, type ISYScene } from './ISY.js';
 
 import { CliConfigSetLevels } from 'winston/lib/winston/config/index.js';
-import { Converters } from './Converters.js';
+import { Converter } from './Converters.js';
 import type { Command } from './Definitions/Global/Commands.js';
 import { Event } from './Definitions/Global/Events.js';
 import type { Constructor } from './Devices/Constructor.js';
@@ -106,7 +106,7 @@ export class ISYNode<
 			.trim();
 		if (this.parentType === NodeType.Folder) {
 			this.folder = isy.folderMap.get(this.parent._);
-			isy.logger.info(`${this.name} this node is in folder ${this.folder}`);
+			isy.logger.debug(`${this.name} is in folder ${this.folder}`);
 			this.logger = (msg: any, level: keyof CliConfigSetLevels = 'debug', ...meta: any[]) => {
 				isy.logger[level](`${this.folder} ${this.name} (${this.address}): ${msg}`, meta);
 				return isy.logger;
@@ -168,7 +168,7 @@ export class ISYNode<
 		if (from === to) return value;
 		else {
 			try {
-				return Converters.Standard[from][to].from(value);
+				return Converter.Standard[from][to].from(value);
 			} catch {
 				this.isy.logger.error(`Conversion from ${UnitOfMeasure[from]} to ${UnitOfMeasure[to]} not supported.`);
 			} finally {
@@ -191,7 +191,7 @@ export class ISYNode<
 		}
 	}
 
-	public emit(event: 'PropertyChanged' | 'ControlTriggered', propertyName?: string, newValue?: any, oldValue?: any, formattedValue?: string, controlName?: string) {
+	public emit(event: 'propertyChanged' | 'controlTriggered', propertyName?: string, newValue?: any, oldValue?: any, formattedValue?: string, controlName?: string) {
 		//if ('PropertyChanged') return super.emit(event, propertyName, newValue, oldValue, formattedValue);
 		//else if ('ControlTriggered') return super.emit(event, controlName);
 	}
@@ -219,7 +219,7 @@ export class ISYNode<
 
 	public async getNotes(): Promise<NodeNotes> {
 		try {
-			const result = await this.isy.sendRequest(`nodes/${this.address}/notes`);
+			const result = await this.isy.sendRequest(`nodes/${this.address}/notes`, { trailingSlash: false, errorLogLevel: 'debug' });
 			if (result !== null && result !== undefined) {
 				return result.NodeProperties;
 			} else {
@@ -232,7 +232,7 @@ export class ISYNode<
 
 	public handleControlTrigger(controlName: keyof E & keyof C): boolean {
 		//this.lastChanged = new Date();
-		this.events.emit('ControlTriggered', controlName);
+		this.events.emit('controlTriggered', controlName);
 		return true;
 	}
 
@@ -253,23 +253,26 @@ export class ISYNode<
 		} else {
 			// this.logger(event.control);
 			const e = event.control;
-			const dispName = this.commands[e].name;
+			const dispName = this.commands[e]?.name;
 			if (dispName !== undefined && dispName !== null) {
-				this.logger(`Command ${dispName} (${e}) triggered.`);
+				this.logger(`Command ${dispName} (${e}) event sent.`);
 			} else {
-				this.logger(`Command ${e} triggered.`);
+				this.logger(`Command ${e} event sent.`);
 			}
 			this.handleControlTrigger(e);
 			return true;
 		}
 	}
 
-	public handlePropertyChange(propertyName: StringKeys<D>, value: any, uom: UnitOfMeasure, formattedValue: string, prec?: number): boolean {
+	public handlePropertyChange(propertyName: StringKeys<D>, value: any, uom: UnitOfMeasure, prec?: number, formattedValue?: string): boolean {
 		this.lastChanged = new Date();
-		const oldValue = this.drivers[propertyName].value;
-		if (this.drivers[propertyName].patch(value, formattedValue, uom, prec)) {
-			this.emit('PropertyChanged', propertyName, value, oldValue, formattedValue);
-			this.scenes.forEach((element) => {
+		let driver = this.drivers[propertyName];
+		this.logger(`Driver ${propertyName} (${driver?.label} value update ${value} (${formattedValue}) uom: ${UnitOfMeasure[uom]} event received.`);
+		const oldValue = driver?.value;
+		if (driver?.patch(value, formattedValue, uom, prec)) {
+			this.logger(`Driver ${driver.label} updated from ${oldValue} to ${value} (${formattedValue})`);
+			this.emit('propertyChanged', propertyName, value, oldValue, formattedValue);
+			this.scenes?.forEach((element) => {
 				this.logger(`Recalulating ${element.deviceFriendlyName}`);
 				element.recalculateState();
 			});

package/src/ISYScene.ts

@@ -77,7 +77,7 @@ export class ISYScene extends ISYNode<Family.Scene, Driver.Signatures<'ST'>,Comm
 	get isOn() {
 		for (const device of this.members) {
 			if (device instanceof Insteon.Relay)  {
-				if (device.drivers.ST?.value === 1) {
+				if (device.drivers.ST?.value != 0) {
 					return true;
 				}
 			}
@@ -110,10 +110,10 @@ export class ISYScene extends ISYNode<Family.Scene, Driver.Signatures<'ST'>,Comm
 	}
 	public markAsChanged() {
 		this.lastChanged = new Date();
-		this.emit('PropertyChanged', 'isOn', this.isOn, this.isOn, this.isOn ? 'on' : 'off');
+		this.emit('propertyChanged', 'isOn', this.isOn, this.isOn, this.isOn ? 'on' : 'off');
 
 		if (this.isDimmable) {
-			this.emit('PropertyChanged', 'brightnesslevel', this.brightnessLevel, this.brightnessLevel, this.brightnessLevel + '%');
+			this.emit('propertyChanged', 'brightnesslevel', this.brightnessLevel, this.brightnessLevel, this.brightnessLevel + '%');
 
 		}
 	}