isy-nodejs 1.0.2-alpha.0 → 1.0.2-alpha.2

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.2-alpha.0",
+    "version": "1.0.2-alpha.2",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -53,6 +53,7 @@
     "dependencies": {
         "@log4js-node/log4js-api": "^1.0.2",
         "@matter/general": "^0.11.4",
+        "@matter/main": "^0.11.4",
         "@matter/types": "^0.11.4",
         "@project-chip/matter-node.js": "^0.11.4",
         "@project-chip/matter.js": "^0.11.4",
@@ -70,5 +71,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1c92bb07bb652f73334bf200841ab4a10f562965"
+    "gitHead": "fac612b29924e40d54cfda336f91c8dc9ba01636"
 }

package/src/ISY.ts

@@ -750,7 +750,7 @@ export class ISY extends EventEmitter implements Disposable {
 						//newDevice = new cls(this, nodeInfo) as ISYDeviceNode<any, any, any, any>;
 					}
 
-					if (m) {
+					if (m && newDevice) {
 						newDevice.productName = m.name;
 						newDevice.model = `(${m.modelNumber}) ${m.name} v.${m.version}`;
 						newDevice.modelNumber = m.modelNumber;

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -17,6 +17,8 @@ import type { ISYNode } from '../../ISYNode.js';
 import type { Family } from '../../Definitions/index.js';
 
 
+
+
 type ClusterForBehavior<B extends ClusterBehavior> = B extends ClusterBehavior.Type<infer C> ? C : never;
 export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D extends ISYNode.DriverSignatures = ISYNode.DriverSignatures> extends Behavior {
 	static override readonly id = 'isyNode';
@@ -33,7 +35,7 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 		var address = this.state.address;
 		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>);
+		this.internal.map = MappingRegistry.getMapping(this.internal.device 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) {
@@ -44,6 +46,8 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 				let evt = `${d.drivers[f].name}Changed`;
 				const obs = Observable<[{ driver: string; newValue: any; oldValue: any; formattedValue: string }]>();
 
+
+
 				d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => obs.emit({ driver, newValue, oldValue, formattedValue }));
 				this.events[evt] = obs;
 

package/src/Model/ClusterMap.ts

@@ -8,7 +8,7 @@ import { DriverType } from '../Definitions/Global/Drivers.js';
 import { Devices } from '../Devices/index.js';
 import { Insteon } from '../Devices/Insteon/index.js';
 
-import type { CommandsOf, DriversOf, ISYNode } from '../ISYNode.js';
+import { CommandsOf, DriversOf, ISYNode } from '../ISYNode.js';
 import { ClusterType } from './ClusterType.js';
 import type { Family } from '../Definitions/index.js';
 
@@ -145,13 +145,13 @@ export class MappingRegistry {
 
 	// #region Public Static Methods (3)
 
-	public static getMapping<T extends ISYNode<any, any, any, any>>(device: T) {
+	public static getMapping<T extends ISYNode<any,any,any,any>>(device: ISYNode<any,any,any,any>) {
 		if(MappingRegistry.map.has(device.family))
 		{
 			let g = MappingRegistry.map.get(device.family);
-			if(g.has(device.name))
+			if(g.has(device.constructor.name))
 			{
-				return g.get(device.name);
+				return g.get(device.constructor.name);
 			}
 			else if(g.has(device.nodeDefId))
 			{