isy-nodejs 1.0.8-alpha.0 → 1.0.9-alpha.1

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.8-alpha.0",
+    "version": "1.0.9-alpha.1",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -74,5 +74,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "4b88acc1e9ee5625c06cfa8cf7359aa0c3ff9faf"
+    "gitHead": "9521cb43ec9bffaa16e91234351abd5981c2037e"
 }

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -49,7 +49,7 @@ export class FanDevice extends CompositeDevice.of({ light: DimmerLamp.Node, moto
 
 
 export namespace Fan {
-	export class Device extends FanDevice { }
+	export const Device = FanDevice;
 
 	export const Motor = FanLincMotor;
 

package/src/Devices/Insteon/InsteonOnOffOutletDevice.ts

@@ -4,9 +4,22 @@ import type { NodeInfo } from '../../Model/NodeInfo.js';
 import { RelayLamp } from './Generated/RelayLamp.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
 import { CompositeDevice, CompositeOf } from '../CompositeDevice.js';
+import type { ISYDevice } from '../../ISYDevice.js';
 
 export class OnOffOutlet extends CompositeDevice.of({ top: RelayLamp.Node, bottom: RelayLamp.Node }, {top: 1, bottom: 2}) {
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 	}
 }
+
+export namespace OnOffOutlet {
+		export function is(node: ISYDevice<any, any, any, any>): node is OnOffOutlet {
+		return node instanceof OnOffOutlet;
+	}
+	export function create(isy: ISY, node: NodeInfo) {
+		return new OnOffOutlet(isy, node);
+	}
+
+	export const Device = OnOffOutlet;
+
+}

package/src/ISY.ts

@@ -831,7 +831,7 @@ export class ISY extends EventEmitter implements Disposable {
 						parent.addNode(node);
 
 				}
-				else
+				else if(!this.deviceList.has(node.address))
 				{
 					this.deviceList.set(node.address, node as unknown as ISYDevice<any, any, any, any>);
 				}

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -59,7 +59,7 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 	}
 
 	mapForBehavior<B extends ClusterBehavior>(behavior: B): ClusterMapping<B, typeof this.internal.device> {
-		return this.map.mapping[behavior.cluster.name];
+		return this.map.mapping[behavior.cluster.name] ?? {attributes: {}, commands: {}};
 	}
 
 	handlePropertyChange(driver: string, newValue: any, oldValue: any, formattedValue: string) {

package/src/Matter/Behaviors/index.ts

@@ -0,0 +1,6 @@
+import './BehaviorRegistry.js';
+export { BehaviorRegistry as Registry } from './BehaviorRegistry.js';
+
+export * from './ISYBridgedDeviceBehavior.js';
+export * from './ISYClusterBehavior.js';
+export * from './Insteon/index.js';

package/src/Matter/Bridge/Server.ts

@@ -12,6 +12,7 @@ import { ISY } from '../../ISY.js';
 import type { ISYNode } from '../../ISYNode.js';
 
 import '../Mappings/index.js';
+import '../Behaviors/Insteon/index.js';
 import { MappingRegistry } from '../Mappings/MappingRegistry.js';
 import { DimmerLevelControlBehavior } from '../Behaviors/Insteon/DimmerLevelControlBehavior.js';
 import { RelayOnOffBehavior } from '../Behaviors/Insteon/index.js';
@@ -237,7 +238,7 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 						let b = BehaviorRegistry.get(device,behavior.cluster.name);
 						if(b)
 						{
-							baseBehavior = deviceType.with(b);
+							baseBehavior = baseBehavior.with(b);
 						}
 					}
 				}

package/src/Matter/Mappings/index.ts

@@ -1 +1,3 @@
-import './Insteon.js';
+import './Insteon.js';
+import './MappingRegistry.js';
+