isy-nodejs 1.0.6-alpha.2 → 1.0.7-alpha.0

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.6-alpha.2",
+    "version": "1.0.7-alpha.0",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -74,5 +74,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3de345bb19ced109099ec8beb4707293e1924922"
+    "gitHead": "ce35a40c2400673ba8035446eb91348ff94d0df4"
 }

package/src/Definitions/Global/Drivers.ts

@@ -282,6 +282,7 @@ export interface Driver<
 		value: T;
 		formattedValue?: any;
 		pendingValue: T;
+		rawValue?: ST;
 	};
 	uom: U;
 

package/src/ISYNode.ts

@@ -270,9 +270,9 @@ export class ISYNode<
 			const e = event.control;
 			const dispName = this.commands[e]?.name;
 			if (dispName !== undefined && dispName !== null) {
-				this.logger(`Command ${dispName} (${e}) event sent.`);
+				this.logger(`Command ${dispName} (${e}) event received.`);
 			} else {
-				this.logger(`Command ${e} event sent.`);
+				this.logger(`Command ${e} event received.`);
 			}
 			this.handleControlTrigger(e);
 			return true;
@@ -282,11 +282,12 @@ export class ISYNode<
 	public handlePropertyChange(propertyName: StringKeys<D>, value: any, uom: UnitOfMeasure, prec?: number, formattedValue?: string): boolean {
 		this.lastChanged = new Date();
 		let driver = this.drivers[propertyName];
-		this.logger(`Driver ${propertyName} (${driver?.label} value update ${value} (${formattedValue}) uom: ${UnitOfMeasure[uom]} event received.`);
-		const oldValue = driver?.value;
+		/*this.logger(`Driver ${propertyName} (${driver?.label} value update ${value} (${formattedValue}) uom: ${UnitOfMeasure[uom]} event received.`);*/
+		const oldValue = driver?.state.value;
+		const oldValueRaw = driver?.state.rawValue;
 		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.logger(`Driver ${driver.label} updated from ${oldValue} (${oldValueRaw}) to ${driver.state.value} (${driver.state.rawValue})`);
+			//this.emit('propertyChanged', propertyName, value, oldValue, formattedValue);
 			this.scenes?.forEach((element) => {
 				this.logger(`Recalulating ${element.deviceFriendlyName}`);
 				element.recalculateState();
@@ -592,7 +593,7 @@ export namespace ISYNode {
 	export type WithDrivers<D extends DriverSignatures> =
 		D extends Driver.Signatures<infer U extends keyof D> ?
 			{
-				[K in D[U]['name']]: D[U] extends { name: K } ? D[U]['value'] : unknown;
+				[K in D[U] as K['name']]: K['value'];
 			}
 		:	never;
 

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -68,7 +68,7 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 
 	override [Symbol.asyncDispose]() {
 		this.internal.device = null;
-		
+
 
 		return super[Symbol.asyncDispose]();
 	}
@@ -80,7 +80,7 @@ export namespace ISYBridgedDeviceBehavior {
 		map?: DeviceToClusterMap<typeof this.device, any>;
 	}
 
-	export type EventsFor<D extends { [x: string]: Driver<any, any, any> }> = {
+	export type EventsFor<D extends { [x: string]: Driver<any,any,any,any,any,any> }> = {
 		[s in keyof D as `${D[s]['name']}Changed`]: Observable<[{ driver: s; newValue: any; oldValue: any; formattedValue: string }]>;
 	};
 

package/src/Matter/Behaviors/ISYClusterBehavior.ts

@@ -59,7 +59,7 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 			this.bridgedDeviceBehavior = behavior;
 			//var behavior = this.agent.get(ISYBridgedDeviceBehavior);
 			this._device = behavior.device as P;
-			this._device.logger('Initializing cluster behavior');
+			this._device.logger(`Initializing cluster behavior: ${this.constructor.name}`);
 			//@ts-ignore
 
 			this.map = behavior.mapForBehavior<T>(this as unknown as T);
@@ -80,7 +80,8 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 					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);
+						//this.device.logger(`Handling property change for ${driver} (${key2}) with value ${newValue}`);
+												//if (convFunc) this.state[key2 as string] = convFunc(newValue);
 						this.state[key2 as string] = convFunc(newValue);
 					};
 				}
@@ -102,7 +103,8 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 
 		async handlePropertyChange({ driver, newValue, oldValue, formattedValue }: PropertyChange<P>) {
 			// for (const key2 in this.map.attributes) {
-			await this.initialize();
+			//await this.initialize();
+			this.device.logger(`${this.constructor.name}: handling property change for ${String(driver)} with value ${newValue}`);
 			if (this.handlers[driver]) {
 				this.handlers[driver](newValue, oldValue, formattedValue);
 			}