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

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/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 != 0) {
+				if (device.drivers.ST?.value) {
 					return true;
 				}
 			}

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -12,6 +12,7 @@ import type { Driver } from '../../Definitions/Global/Drivers.js';
 import { ISY, type Family, type ISYNode } from '../../ISY.js';
 import type { ISYDevice } from '../../ISYDevice.js';
 import { DeviceToClusterMap, MappingRegistry, type ClusterMapping, type BehaviorMapping } from '../../Model/ClusterMap.js';
+import { server } from 'typescript';
 
 
 type ClusterForBehavior<B extends ClusterBehavior> = B extends ClusterBehavior.Type<infer C> ? C : never;
@@ -31,9 +32,11 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 		const d = ISY.instance.nodeMap.get(this.state.address);
 		this.internal.device = d;
 		this.internal.map = MappingRegistry.getMapping(this.internal.device as unknown as ISYNode<Family, any, any, any>);
+		
 		ISY.instance.logger.debug(`Initializing ${this.constructor.name} for ${this.internal.device.constructor.name} ${this.internal.device.name} with address ${address}`);
 		if (d) {
 			d.events.on('propertyChanged', this.handlePropertyChange.bind(this));
+
 			for(const f in d.drivers)
 			{
 				let evt = `${d.drivers[f].name}Changed`;
@@ -41,7 +44,8 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 
 				d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => obs.emit({ driver, newValue, oldValue, formattedValue }));
 				this.events[evt] = obs;
-				
+
+
 				//@ts-ignore
 				//d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => this.events.emit(evt, { driver, newValue, oldValue, formattedValue } as unknown as any));
 
@@ -62,13 +66,17 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 	}
 
 	handlePropertyChange(driver: string, newValue: any, oldValue: any, formattedValue: string) {
+
 		this.events.propertyChanged.emit({ driver, newValue, oldValue, formattedValue });
+
+
 	}
 
 	override [Symbol.asyncDispose]() {
 
 		this.internal.device = null;
 
+
 		return super[Symbol.asyncDispose]();
 	}
 }

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';
@@ -14,6 +15,7 @@ import { ISY, type ISYDevice } from '../../ISY.js';
 import type { DriversOf, ISYNode } from '../../ISYNode.js';
 import { BehaviorMapping, MappingRegistry, type ClusterMapping, type DeviceToClusterMap } from '../../Model/ClusterMap.js';
 import { ISYBridgedDeviceBehavior } from './ISYBridgedDeviceBehavior.js';
+import { loggers } from 'winston';
 
 // #region Type aliases (6)
 
@@ -21,7 +23,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>;
@@ -60,33 +62,40 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 
 		override async initialize(_options?: {}) {
 			await super.initialize(_options);
+
 			var behavior = (await this.agent.load(ISYBridgedDeviceBehavior)) as ISYBridgedDeviceBehavior<P>;
 			this.bridgedDeviceBehavior = behavior;
 			//var behavior = this.agent.get(ISYBridgedDeviceBehavior);
 			this._device = behavior.device as P;
 			//@ts-ignore
+
 			this.map = behavior.mapForBehavior<T>(this as unknown as T);
 			for (const key2 in this.map.attributes) {
 				let val = this.map.attributes[key2];
 				let driverObj = null;
 				if (typeof val === 'string' || typeof val === 'symbol' || typeof val === 'number') {
 					driverObj = this._device.drivers[val];
+					this.state[key2 as string] = this._device.drivers[val].value;
 					this.handlers[val] = (newValue, oldValue, formattedValue) => {
 						this.state[key2 as string] = newValue;
 					};
+
 				} else if (val.driver as DriversOf<P>) {
 					driverObj = this._device.drivers[val.driver as string];
 
 					let { driver, converter } = val;
-					const convFunc = Converter.get(converter)?.from;
+					const convFunc = Converter.get(converter)?.to;
+					if(!convFunc) throw new Error(`Converter ${converter} not found`);
+					this.state[key2 as string] = convFunc(this._device.drivers[driver as string].value);
 					this.handlers[driver] = (newValue, oldValue, formattedValue) => {
-						if (convFunc) this.state[key2 as string] = convFunc(newValue);
-						else this.state[key2 as string] = newValue;
+						//if (convFunc) this.state[key2 as string] = convFunc(newValue);
+						 this.state[key2 as string] = convFunc(newValue);
 					};
 				}
 				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 +108,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 → Insteon/ISYOnOffBehavior.ts}

@@ -5,42 +5,34 @@ import { DimmableLightRequirements } from '@project-chip/matter.js/devices/Dimma
 import { OnOffLightRequirements } from '@project-chip/matter.js/devices/OnOffLightDevice';
 import { OnOffLightSwitchDevice } from '@project-chip/matter.js/devices/OnOffLightSwitchDevice';
 import type { MaybePromise } from '@project-chip/matter.js/util';
-import { DriverType } from '../../Definitions/Global/Drivers.js';
-import { InsteonDimmableDevice } from '../../Devices/Insteon/InsteonDimmableDevice.js';
-import { InsteonRelayDevice } from '../../Devices/Insteon/InsteonRelayDevice.js';
-import { MappingRegistry } from '../../Model/ClusterMap.js';
-import { ClusterForBehavior, ISYClusterBehavior, type PropertyChange } from './ISYClusterBehavior.js';
+import { DriverType } from '../../../Definitions/Global/Drivers.js';
+import { InsteonDimmableDevice } from '../../../Devices/Insteon/InsteonDimmableDevice.js';
+import { InsteonRelayDevice } from '../../../Devices/Insteon/InsteonRelayDevice.js';
+import { MappingRegistry } from '../../../Model/ClusterMap.js';
+import { ClusterForBehavior, ISYClusterBehavior, type PropertyChange } from '../ISYClusterBehavior.js';
 
-import { Converter } from '../../Converters.js';
+import { Converter } from '../../../Converters.js';
 
 export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.OnOffServer, InsteonRelayDevice) {
 	override async initialize(_options?: {}) {
 		await super.initialize(_options);
+		//this.state.onOff = this.device.status;
 		//this.state.onOff = await this.device.state;
 	}
 
 	override on = async () => {
-		await super.on();
 		await this.device.on();
 
 		//this.device.commands.DON = true;
 	};
 
 	override async off() {
-		await super.off();
 		await this.device.off();
 
 		// this.device.drivers = false;
 	}
 
-	override toggle = async () => {
-		//this.device.state = !(await this.device.state);
-	};
-
 	override async handlePropertyChange({ driver, newValue, oldValue, formattedValue }: PropertyChange<InsteonRelayDevice>) {
-		/*if (driver === 'ST') {
-			this.state.onOff = newValue;
-		}*/
 
 		return super.handlePropertyChange({ driver, newValue, oldValue, formattedValue });
 	}
@@ -58,9 +50,10 @@ export class ISYDimmableBehavior extends ISYClusterBehavior(DimmableLightRequire
 	override setLevel(level: number): MaybePromise<void> {
 		level = Converter.Matter.LevelFrom0To255.LightingLevel.from(level);
 		if (level > 0) {
-			return this.device.on();
+			return this.device.on(level);
 		} else {
 			return this.device.off();
 		}
+
 	}
 }

package/src/Matter/Bridge/Server.ts

@@ -20,7 +20,7 @@ import { format, loggers } from 'winston';
 import type { ISYDeviceNode } from '../../Devices/ISYDeviceNode.js';
 import { InsteonDimmableDevice, InsteonKeypadButtonDevice, InsteonRelayDevice, ISY } from '../../ISY.js';
 import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
-import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/ISYOnOffBehavior.js';
+import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
 import '../Mappings/Insteon.js';
 
 // #region Interfaces (1)

package/src/Matter/Mappings/Insteon.ts

@@ -19,7 +19,7 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 		mapping: {
 			OnOff: {
 				attributes: {
-					onOff: { driver: 'ST', converter: 'Percent.Boolean' }
+					onOff: 'ST'
 				},
 				commands: { on: 'DON' }
 			}
@@ -47,9 +47,9 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 			},
 			LevelControl: {
 				attributes: {
-					currentLevel: { driver: DriverType.Status, converter: 'LevelFrom0To255.LightingLevel' }
+					currentLevel: { driver: 'ST', converter: 'LevelFrom0To255.LightingLevel' }
 				},
-				commands: { moveToLevel: { command: 'DON' } }
+				commands: { setLevel: { command: 'DON' } }
 			}
 		}
 	}

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;