isy-nodejs 1.0.1-alpha.25 → 1.0.1-alpha.26

package/package.json

@@ -2,7 +2,7 @@
     "name": "isy-nodejs",
     "description": "Node.js wrapper for ISY interface including websockets for change notifications. Fork of isy-js by Rod Toll. Designed to be used in a node.js application.",
     "license": "MIT",
-    "version": "1.0.1-alpha.25",
+    "version": "1.0.1-alpha.26",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "99f03336e2db40ef91e58b059969abba6534c74a"
+    "gitHead": "256b7ec74dbf1f1abcbfb7e0023f7c43ace45ad9"
 }

package/src/Converters.ts

@@ -51,8 +51,8 @@ export const ConverterRegistry = new Map<string, Converter<any, any>>();
 function registerConverters() {
 	for (const from in StandardConverters) {
 		for (const to in StandardConverters[from]) {
-			registerConverter(UnitOfMeasure[from], UnitOfMeasure[to], StandardConverters[from][to] as Converter<any, any>);
-			registerConverter(UnitOfMeasure[to], UnitOfMeasure[from], invert(StandardConverters[from][to]) as Converter<any, any>);
+			registerConverter(from, to, StandardConverters[from][to] as Converter<any, any>);
+			registerConverter(to, from, invert(StandardConverters[from][to]) as Converter<any, any>);
 		}
 	}
 	for (const from in Converter.Matter) {
@@ -64,8 +64,8 @@ function registerConverters() {
 }
 
 export function registerConverter(
-	from: keyof typeof StandardConverters | UnitOfMeasure | keyof typeof Converter.Matter | string,
-	to: keyof typeof StandardConverters | UnitOfMeasure | keyof typeof Converter.Matter | string,
+	from: keyof typeof StandardConverters | keyof typeof Converter.Matter | string,
+	to: keyof typeof StandardConverters | keyof typeof Converter.Matter | string,
 	converter: Converter<any, any>
 ) {
 	if (!StdConverterRegistry.has(from)) {
@@ -108,7 +108,7 @@ export namespace Converter {
 	export type MatterConverters = `${MatterISYConvertibleTypes}.${ISYMatterConvertibleTypes}` | `${ISYMatterConvertibleTypes}.${MatterISYConvertibleTypes}`;
 
 	export type KnownConverters = StandardConverters | MatterConverters;
-
+	const cache : {[x:string]:Converter<any,any>} = {};
 	export function get(label: KnownConverters): Converter<any, any>;
 	export function get(from: UnitOfMeasure, to: UnitOfMeasure);
 	export function get(from: ConverterTypes, to: ConverterTypes);
@@ -116,16 +116,26 @@ export namespace Converter {
 	export function get(from: MatterISYConvertibleTypes, to: ISYMatterConvertibleTypes);
 	export function get(to: ISYMatterConvertibleTypes, from: MatterISYConvertibleTypes);
 	export function get(from: UnitOfMeasure | `${keyof typeof UnitOfMeasure}` | string, to?: UnitOfMeasure | `${keyof typeof UnitOfMeasure}` | string): Converter<any, any> {
+		if(to === undefined) {
+			return ConverterRegistry.get(from as string) ?? NullConverter;
+		}
+		if(cache[`${from}.${to}`]) {
+			return cache[`${from}.${to}`];
+		}
+		else if(cache[`${to}.${from}`]) {
+			cache[`${from}.${to}`] = invert(cache[`${to}.${from}`]);
+			return cache[`${from}.${to}`];
+		}
 		let isString = typeof from === 'string';
-		let fuom = isString ? UnitOfMeasure[from] : from;
+		let fuom = isString ? from : UnitOfMeasure[from];
 		if (to) {
-			let tuom = typeof to === 'string' ? UnitOfMeasure[to] : to;
+			let tuom = typeof to === 'string' ? to : UnitOfMeasure[to]; ;
 
 			if (StdConverterRegistry.has(fuom)) {
-				return StdConverterRegistry.get(fuom).get(tuom);
+				if(StdConverterRegistry.get(fuom).has(tuom)) {
+					return StdConverterRegistry.get(fuom).get(tuom);
+				}
 			}
-		} else if (typeof from === 'string') {
-			return ConverterRegistry.get(from);
 		}
 		return NullConverter;
 	}

package/src/Definitions/Global/Drivers.ts

@@ -427,6 +427,7 @@ export namespace Driver {
 						converter ? converter.from(initState.value)
 						:	(node.convertFrom(initState?.value, initState?.uom, driver as D) as T)
 					:	null,
+				rawValue: initState ? initState.value : null,
 				formattedValue: initState ? initState.formatted : null,
 				pendingValue: null
 			},
@@ -437,22 +438,30 @@ export namespace Driver {
 				return s;
 			},
 			apply(state: DriverState, notify = false) {
-				let previousValue = this.state.value;
-				this.state.value = converter ? converter.from(state.value) : node.convertFrom(state.value, state.uom, driver as D);
-				this.state.formattedValue = state.formatted;
-				if (previousValue == this.state.value) {
+				let previousValue = this.state.rawValue;
+				this.state.rawValue = state.value;
+				if (previousValue === this.state.rawValue) {
 					return false;
 				}
+				if (state.uom != this.uom) {
+					this.serverUom == state.uom;
+					this.state.value = converter ? converter.from(this.state.rawValue) : Converter.convert(state.uom, this.uom, this.state.rawValue);
+				} else if (converter) {
+					this.state.value = converter.from(state.value);
+				} else {
+					this.state.value = state.value;
+				}
+				this.state.formattedValue = state.formatted;
 				if (notify) node.events.emit(`${this.name}Changed`, driver as D, this.state.value, previousValue, this.state.formattedValue);
 				return true;
 			},
 			patch(value: T, formattedValue: string, uom: UnitOfMeasure, prec: number, notify = true) {
-				let previousValue = this.state.value;
-
+				let previousValue = this.state.rawValue;
+				this.state.rawValue = value;
 				this.state.formattedValue = formattedValue;
 				if (uom != this.uom) {
 					this.serverUom == uom;
-					this.state.value = converter ? converter.from(value) : Converter.convert(uom, this.uom, value);
+					this.state.value = converter ? converter.from(this.state.rawValue) : Converter.convert(uom, this.uom, this.state.rawValue);
 
 				}
 				else if(converter)
@@ -466,7 +475,7 @@ export namespace Driver {
 				if (previousValue == this.state.value) {
 					return false;
 				}
-				if (notify) node.events.emit(`${this.name}Changed`, driver as D, value, previousValue, formattedValue);
+				if (notify) node.events.emit(`${this.name}Changed`, driver as D, this.state.value,  previousValue, formattedValue);
 				return true;
 			},
 			get value() {

package/src/Devices/Insteon/DimmerLampSwitch.ts

@@ -1,19 +1,18 @@
 /* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
 
-import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
+import { Driver } from '../../Definitions/Global/Drivers.js';
 import { Family } from '../../Definitions/Global/Families.js';
-import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
+import { Insteon } from '../../Definitions/index.js';
 import type { ISY } from '../../ISY.js';
 import type { ISYNode } from '../../ISYNode.js';
-import { InsteonBaseDevice as Base } 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 type { NodeInfo } from '../../Model/NodeInfo.js';
+import { ISYDeviceNode } from '../ISYDeviceNode.js';
 import { NodeFactory } from '../NodeFactory.js';
+import { InsteonBaseDevice as Base } from './InsteonBaseDevice.js';
 
-
-export const nodeDefId = "DimmerLampSwitch";
+export const nodeDefId = 'DimmerLampSwitch';
 
 type Commands = DimmerLampSwitch.Commands;
 type Drivers = DimmerLampSwitch.Drivers;
@@ -36,60 +35,59 @@ export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements Dim
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static override nodeDefId = "DimmerLampSwitch";
-	declare readonly nodeDefId: "DimmerLampSwitch";
-	constructor (isy: ISY, nodeInfo: NodeInfo) {
+	static override nodeDefId = 'DimmerLampSwitch';
+	declare readonly nodeDefId: 'DimmerLampSwitch';
+	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" });
-		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
-		
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.OL = Driver.create('OL', this, nodeInfo.state['OL'] as DriverState, { uom: UnitOfMeasure.Percent, label: 'On Level', name: 'onLevel' });
+		this.drivers.RR = Driver.create('RR', this, nodeInfo.state['RR'] as DriverState, { uom: UnitOfMeasure.Index, label: 'Ramp Rate', name: 'rampRate' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'] as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 	}
 	async on(value?: number) {
-		return this.sendCommand("DON", { value: value });
+		return this.sendCommand('DON', { value: value });
 	}
 	async off() {
-		return this.sendCommand("DOF");
+		return this.sendCommand('DOF');
 	}
 	async fastOff() {
-		return this.sendCommand("DFOF");
+		return this.sendCommand('DFOF');
 	}
 	async fastOn() {
-		return this.sendCommand("DFON");
+		return this.sendCommand('DFON');
 	}
 	async brighten() {
-		return this.sendCommand("BRT");
+		return this.sendCommand('BRT');
 	}
 	async dim() {
-		return this.sendCommand("DIM");
+		return this.sendCommand('DIM');
 	}
 	async fadeUp() {
-		return this.sendCommand("FDUP");
+		return this.sendCommand('FDUP');
 	}
 	async fadeDown() {
-		return this.sendCommand("FDDOWN");
+		return this.sendCommand('FDDOWN');
 	}
 	async fadeStop() {
-		return this.sendCommand("FDSTOP");
+		return this.sendCommand('FDSTOP');
 	}
 	async query() {
-		return this.sendCommand("QUERY");
+		return this.sendCommand('QUERY');
 	}
 	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
+		return this.sendCommand('BEEP', { value: value });
 	}
 	async updateOnLevel(value: number) {
-		return this.sendCommand("OL", { value: value });
+		return this.sendCommand('OL', { value: value });
 	}
 	async updateRampRate(value: number) {
-		return this.sendCommand("RR", { value: value });
+		return this.sendCommand('RR', { value: value });
 	}
 	async backlight(value: number) {
-		return this.sendCommand("BL", { value: value });
+		return this.sendCommand('BL', { value: value });
 	}
 	async writeChanges() {
-		return this.sendCommand("WDU");
+		return this.sendCommand('WDU');
 	}
 	public get status(): number {
 		return this.drivers.ST?.value;
@@ -109,7 +107,7 @@ NodeFactory.register(DimmerLampSwitchNode);
 
 export namespace DimmerLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof DimmerLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "DimmerLampSwitch";
+		nodeDefId: 'DimmerLampSwitch';
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is DimmerLampSwitchNode {
 		return node.nodeDefId === nodeDefId;
@@ -120,90 +118,90 @@ export namespace DimmerLampSwitch {
 	export const Node = DimmerLampSwitchNode;
 	export type Commands = {
 		DON: ((value?: number) => Promise<boolean>) & {
-			label: "On";
-			name: "on";
+			label: 'On';
+			name: 'on';
 		};
 		DOF: (() => Promise<boolean>) & {
-			label: "Off";
-			name: "off";
+			label: 'Off';
+			name: 'off';
 		};
 		DFOF: (() => Promise<boolean>) & {
-			label: "Fast Off";
-			name: "fastOff";
+			label: 'Fast Off';
+			name: 'fastOff';
 		};
 		DFON: (() => Promise<boolean>) & {
-			label: "Fast On";
-			name: "fastOn";
+			label: 'Fast On';
+			name: 'fastOn';
 		};
 		BRT: (() => Promise<boolean>) & {
-			label: "Brighten";
-			name: "brighten";
+			label: 'Brighten';
+			name: 'brighten';
 		};
 		DIM: (() => Promise<boolean>) & {
-			label: "Dim";
-			name: "dim";
+			label: 'Dim';
+			name: 'dim';
 		};
 		FDUP: (() => Promise<boolean>) & {
-			label: "Fade Up";
-			name: "fadeUp";
+			label: 'Fade Up';
+			name: 'fadeUp';
 		};
 		FDDOWN: (() => Promise<boolean>) & {
-			label: "Fade Down";
-			name: "fadeDown";
+			label: 'Fade Down';
+			name: 'fadeDown';
 		};
 		FDSTOP: (() => Promise<boolean>) & {
-			label: "Fade Stop";
-			name: "fadeStop";
+			label: 'Fade Stop';
+			name: 'fadeStop';
 		};
 		QUERY: (() => Promise<boolean>) & {
-			label: "Query";
-			name: "query";
+			label: 'Query';
+			name: 'query';
 		};
 		BEEP: ((value?: number) => Promise<boolean>) & {
-			label: "Beep";
-			name: "beep";
+			label: 'Beep';
+			name: 'beep';
 		};
 		OL: ((value: number) => Promise<boolean>) & {
-			label: "On Level";
-			name: "updateOnLevel";
+			label: 'On Level';
+			name: 'updateOnLevel';
 		};
 		RR: ((value: number) => Promise<boolean>) & {
-			label: "Ramp Rate";
-			name: "updateRampRate";
+			label: 'Ramp Rate';
+			name: 'updateRampRate';
 		};
 		BL: ((value: number) => Promise<boolean>) & {
-			label: "Backlight";
-			name: "backlight";
+			label: 'Backlight';
+			name: 'backlight';
 		};
 		WDU: (() => Promise<boolean>) & {
-			label: "Write Changes";
-			name: "writeChanges";
+			label: 'Write Changes';
+			name: 'writeChanges';
 		};
 	};
 	export type Drivers = {
 		ST: {
 			uom: UnitOfMeasure.Percent;
 			value: number;
-			label: "Status";
-			name: "status";
+			label: 'Status';
+			name: 'status';
 		};
 		OL: {
 			uom: UnitOfMeasure.Percent;
 			value: number;
-			label: "On Level";
-			name: "onLevel";
+			label: 'On Level';
+			name: 'onLevel';
 		};
 		RR: {
 			uom: UnitOfMeasure.Index;
 			value: number;
-			label: "Ramp Rate";
-			name: "rampRate";
+			label: 'Ramp Rate';
+			name: 'rampRate';
 		};
 		ERR: {
 			uom: UnitOfMeasure.Index;
 			value: Insteon.Error;
-			label: "Responding";
-			name: "responding";
+			label: 'Responding';
+			name: 'responding';
 		};
 	};
 }

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -32,8 +32,8 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	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' });
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 	}
 	async on(value?: 0 | 100) {
 		return this.sendCommand('DON', { value: value });

package/src/ISY.ts

@@ -41,10 +41,10 @@ import type { NodeInfo } from './Model/NodeInfo.js';
 import * as Utils from './Utils.js';
 
 import { X2jOptions, XMLParser } from 'fast-xml-parser';
+import path from 'path';
 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,
@@ -561,16 +561,13 @@ export class ISY extends EventEmitter implements Disposable {
 		let uriToUse = `nodes/${node.address}/cmd/${command}`;
 		if (parameters !== null && parameters !== undefined) {
 			if (typeof parameters == 'object') {
-
 				var q = parameters as Record<P, string | number>;
 				for (const paramName of Object.getOwnPropertyNames(q)) {
-					if(paramName === 'value')
-					{
+					if (paramName === 'value') {
 						uriToUse += `/${q[paramName]}`;
 						continue;
 					}
-					if(typeof q[paramName] === 'string' || typeof q[paramName] === 'number')
-						uriToUse += `/${paramName}/${q[paramName]}`;
+					if (typeof q[paramName] === 'string' || typeof q[paramName] === 'number') uriToUse += `/${paramName}/${q[paramName]}`;
 				}
 
 				//uriToUse += `/${q[((p : Record<string,number|number>) => `${p[]}/${p.paramValue}` ).join('/')}`;
@@ -752,17 +749,24 @@ export class ISY extends EventEmitter implements Disposable {
 				const enabled = nodeInfo.enabled ?? true;
 				const d = await NodeFactory.get(nodeInfo);
 				const m = DeviceFactory.getDeviceDetails(nodeInfo);
+				const cls = m?.class ?? d;
+				nodeInfo.property = Array.isArray(nodeInfo.property) ? nodeInfo.property : [nodeInfo.property];
+				nodeInfo.state = nodeInfo.property.reduce((acc, p) => {
+					if (p && p?.id) {
+						p.name = p.name == '' ? undefined : p.name;
+						acc[p.id] = p;
+					}
+					return acc;
+				}, {});
+				newDevice = new cls(this, nodeInfo) as ISYDeviceNode<any, any, any, any>;
 
-				if (d) {
-					newDevice = new d(this, nodeInfo) as ISYDeviceNode<any, any, any, any>;
-				}
 				if (m) {
-					newDevice = newDevice ?? (new m.class(this, nodeInfo) as unknown as ISYDeviceNode<any, any, any, any>);
 					newDevice.productName = m.name;
 					newDevice.model = `(${m.modelNumber}) ${m.name} v.${m.version}`;
 					newDevice.modelNumber = m.modelNumber;
 					newDevice.version = m.version;
 				}
+
 				if (enabled) {
 					if (newDevice === null) {
 						this.logger.warn(`Device type resolution failed for ${nodeInfo.name} with type: ${nodeInfo.type} and nodedef: ${nodeInfo.nodeDefId}`);

package/src/Matter/Behaviors/ISYClusterBehavior.ts

@@ -6,6 +6,7 @@ import type { OnOffBehavior, OnOffServer } from '@project-chip/matter.js/behavio
 import type { Cluster, ClusterServerHandlers, ClusterType as CT } from '@project-chip/matter.js/cluster';
 import '@project-chip/matter.js/device';
 import { OnOffLightRequirements } from '@project-chip/matter.js/devices/OnOffLightDevice';
+import type { AnyMxRecord } from 'dns';
 import { Converter } from '../../Converters.js';
 import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import type { Constructor } from '../../Devices/Constructor.js';
@@ -21,7 +22,7 @@ export type ClusterForBehavior<B> = B extends ClusterBehavior.Type<infer C, infe
 export type ConstructedType<B extends Constructor<any>> = B extends Constructor<infer C> ? C : never;
 // <reference path="MatterDevice.js" />
 // @ts-ignore
-export type DeviceBehavior<P extends ISYNode, T extends { cluster? }> = {
+export type DeviceBehavior<P extends ISYNode<any, any, any, any>, T extends { cluster? }> = {
 	device: P;
 
 	bridgedDeviceBehavior: ISYBridgedDeviceBehavior<P>;
@@ -86,7 +87,8 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 				}
 				if (driverObj) {
 					let evt = `${driverObj.name}Changed`;
-					this.reactTo(behavior.events[evt], this.handlePropertyChange.bind(this), { lock: false });
+					(this as any).evt = this.handlers[driverObj.name];
+					this.reactTo(behavior.events[evt], this.handlePropertyChange, { lock: false });
 				}
 			}
 
@@ -99,9 +101,9 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 			return (this._device = this._device ?? (this.agent.get(ISYBridgedDeviceBehavior).device as P));
 		}
 
-		handlePropertyChange({ driver, newValue, oldValue, formattedValue }: PropertyChange<P>) {
+		async handlePropertyChange({ driver, newValue, oldValue, formattedValue }: PropertyChange<P>) {
 			// for (const key2 in this.map.attributes) {
-
+			await this.initialize();
 			if (this.handlers[driver]) {
 				this.handlers[driver](newValue, oldValue, formattedValue);
 			}

package/src/Matter/Behaviors/ISYOnOffBehavior.ts

@@ -16,6 +16,7 @@ import { Converter } from '../../Converters.js';
 export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.OnOffServer, InsteonRelayDevice) {
 	override async initialize(_options?: {}) {
 		await super.initialize(_options);
+		this.state.onOff = (await this.device.status) > 0;
 		//this.state.onOff = await this.device.state;
 	}
 
@@ -38,9 +39,6 @@ export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.
 	};
 
 	override async handlePropertyChange({ driver, newValue, oldValue, formattedValue }: PropertyChange<InsteonRelayDevice>) {
-		/*if (driver === 'ST') {
-			this.state.onOff = newValue;
-		}*/
 
 		return super.handlePropertyChange({ driver, newValue, oldValue, formattedValue });
 	}

package/src/Model/NodeInfo.ts

@@ -4,7 +4,7 @@ import type { DriverState } from './DriverState.js';
 
 // #region Type aliases (1)
 
-export type NodeInfo<T extends Family = Family> = T extends Family.ZWave ? DynamicNodeInfo : StaticNodeInfo;
+export type NodeInfo<T extends Family = Family> = (T extends Family.ZWave ? DynamicNodeInfo : StaticNodeInfo) & { state?: { [x: string]: DriverState } };
 
 // #endregion Type aliases (1)
 
@@ -47,6 +47,7 @@ export interface DynamicNodeInfo {
 	parent?: Parent;
 	pnode: any;
 	property?: DriverState[] | DriverState;
+
 	rpnode: string;
 	sgid: string;
 	startDelay: number;