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

package/src/Devices/Insteon/Generated/Siren.ts

@@ -17,7 +17,7 @@ const nodeDefId = "Siren";
 type Commands = Siren.Commands;
 type Drivers = Siren.Drivers;
 
-export class SirenNode extends Base<Drivers, Commands> implements Siren.Interface {
+class SirenNode extends Base<Drivers, Commands> implements Siren.Interface {
 	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
@@ -28,15 +28,15 @@ export class SirenNode extends Base<Drivers, Commands> implements Siren.Interfac
 		WDU: this.writeChanges
 	};
 	static override nodeDefId = "Siren";
-	static override implements = ["Siren", "SirenAlert", "SirenArm"];
-	declare readonly nodeDefId: "Siren" | "Siren_ADV";
+	static override implements = ['Siren', "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: 'Siren' | "Siren_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Siren", name: "siren" });
-		this.drivers.MODE = Driver.create("MODE", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Mode", name: "mode" });
-		this.drivers.DELAY = Driver.create("DELAY", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.DurationInSeconds, label: "Arm Countdown", name: "armCountdown" });
-		this.drivers.DUR = Driver.create("DUR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.DurationInSeconds, label: "Siren Duration", name: "sirenDuration" });
-		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: "Siren", name: "siren" });
+		this.drivers.MODE = Driver.create("MODE", this, nodeInfo.state['MODE'], { uom: UnitOfMeasure.Index, label: "Mode", name: "mode" });
+		this.drivers.DELAY = Driver.create("DELAY", this, nodeInfo.state['DELAY'], { uom: UnitOfMeasure.DurationInSeconds, label: "Arm Countdown", name: "armCountdown" });
+		this.drivers.DUR = Driver.create("DUR", this, nodeInfo.state['DUR'], { uom: UnitOfMeasure.DurationInSeconds, label: "Siren Duration", name: "sirenDuration" });
+		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
 	async on(duration?: number) { return this.sendCommand("DON", { DUR: duration }); }
 	async off() { return this.sendCommand("DOF"); }
@@ -67,13 +67,12 @@ NodeFactory.register(SirenNode, "Siren_ADV");
 
 export namespace Siren {
 	export interface Interface extends Omit<InstanceType<typeof SirenNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "Siren" | "Siren_ADV";
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is SirenNode {
-		return ["Siren", "Siren_ADV"].includes(node.nodeDefId);
+		return ['Siren', "Siren_ADV"].includes(node.nodeDefId);
 	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is SirenNode {
-		return ["Siren", "Siren_ADV"].includes(node.nodeDefId);
+		return ['Siren', "Siren_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new SirenNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/SirenAlert.ts

@@ -17,14 +17,14 @@ const nodeDefId = "SirenAlert";
 type Commands = SirenAlert.Commands;
 type Drivers = SirenAlert.Drivers;
 
-export class SirenAlertNode extends Base<Drivers, Commands> implements SirenAlert.Interface {
+class SirenAlertNode extends Base<Drivers, Commands> implements SirenAlert.Interface {
 	public override readonly commands = {};
 	static override nodeDefId = "SirenAlert";
-	static override implements = ["SirenAlert"];
-	declare readonly nodeDefId: "SirenAlert" | "SirenArm";
+	static override implements = ['SirenAlert'];
+	declare readonly nodeDefId: 'SirenAlert' | "SirenArm";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
+		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
 	public get responding(): Insteon.Error {
 		return this.drivers.ERR?.value;
@@ -36,13 +36,12 @@ NodeFactory.register(SirenAlertNode, "SirenArm");
 
 export namespace SirenAlert {
 	export interface Interface extends Omit<InstanceType<typeof SirenAlertNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "SirenAlert" | "SirenArm";
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is SirenAlertNode {
-		return ["SirenAlert", "SirenArm"].includes(node.nodeDefId);
+		return ['SirenAlert', "SirenArm"].includes(node.nodeDefId);
 	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is SirenAlertNode {
-		return ["SirenAlert", "X10", "Thermostat", "TempLinc", "OnOffControl", "OnOffControl_ADV", "DimmerMotorSwitch", "DimmerMotorSwitch_ADV", "DimmerLampSwitch", "DimmerLampSwitch_ADV", "DimmerLampSwitchLED", "DimmerLampSwitchLED_ADV", "DimmerSwitchOnly", "DimmerSwitchOnly_ADV", "DimmerLampOnly", "KeypadDimmer", "KeypadDimmer_ADV", "BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "RelaySwitchOnlyPlusQuery", "RelaySwitchOnlyPlusQuery_ADV", "RelaySwitchOnly", "RelaySwitchOnly_ADV", "RelayLampOnly", "RelayLampOnly_ADV", "KeypadRelay", "KeypadRelay_ADV", "RemoteLinc2", "RemoteLinc2_ADV", "IRLincTx", "FanLincMotor", "KeypadButton", "KeypadButton_ADV", "EZRAIN_Output", "EZRAIN_Input", "EZRAIN_Input_ADV", "EZIO2x4_Output", "EZIO2x4_Input", "EZIO2x4_Input_ADV", "IMETER_SOLO", "DoorLock", "BinaryAlarm", "BinaryAlarm_ADV", "BinaryControl", "BinaryControl_ADV", "AlertModuleSiren", "AlertModuleSiren_ADV", "AlertModuleArmed", "Siren", "Siren_ADV", "SirenArm", "PIR2844_ADV", "PIR2844C_ADV", "PIR2844OnOff_ADV"].includes(node.nodeDefId);
+		return ['SirenAlert', "X10", "Thermostat", "TempLinc", "OnOffControl", "OnOffControl_ADV", "DimmerMotorSwitch", "DimmerMotorSwitch_ADV", "DimmerLampSwitch", "DimmerLampSwitch_ADV", "DimmerLampSwitchLED", "DimmerLampSwitchLED_ADV", "DimmerSwitchOnly", "DimmerSwitchOnly_ADV", "DimmerLampOnly", "KeypadDimmer", "KeypadDimmer_ADV", "BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "RelaySwitchOnlyPlusQuery", "RelaySwitchOnlyPlusQuery_ADV", "RelaySwitchOnly", "RelaySwitchOnly_ADV", "RelayLampOnly", "RelayLampOnly_ADV", "KeypadRelay", "KeypadRelay_ADV", "RemoteLinc2", "RemoteLinc2_ADV", "IRLincTx", "FanLincMotor", "KeypadButton", "KeypadButton_ADV", "EZRAIN_Output", "EZRAIN_Input", "EZRAIN_Input_ADV", "EZIO2x4_Output", "EZIO2x4_Input", "EZIO2x4_Input_ADV", "IMETER_SOLO", "DoorLock", "BinaryAlarm", "BinaryAlarm_ADV", "BinaryControl", "BinaryControl_ADV", "AlertModuleSiren", "AlertModuleSiren_ADV", "AlertModuleArmed", "Siren", "Siren_ADV", "SirenArm", "PIR2844_ADV", "PIR2844C_ADV", "PIR2844OnOff_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new SirenAlertNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/TempLinc.ts

@@ -17,7 +17,7 @@ const nodeDefId = "TempLinc";
 type Commands = TempLinc.Commands;
 type Drivers = TempLinc.Drivers;
 
-export class TempLincNode extends Base<Drivers, Commands> implements TempLinc.Interface {
+class TempLincNode extends Base<Drivers, Commands> implements TempLinc.Interface {
 	public override readonly commands = {
 		CLISPH: this.updateHeatSetpoint,
 		CLISPC: this.updateCoolSetpoint,
@@ -31,18 +31,18 @@ export class TempLincNode extends Base<Drivers, Commands> implements TempLinc.In
 		WDU: this.writeChanges
 	};
 	static override nodeDefId = "TempLinc";
-	static override implements = ["TempLinc", "IRLincTx", "SirenAlert", "SirenArm"];
-	declare readonly nodeDefId: "TempLinc";
+	static override implements = ['TempLinc', "IRLincTx", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: 'TempLinc';
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Degree, label: "Temperature", name: "temperature" });
-		this.drivers.CLISPH = Driver.create("CLISPH", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Degree, label: "Heat Setpoint", name: "heatSetpoint" });
-		this.drivers.CLISPC = Driver.create("CLISPC", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Degree, label: "Cool Setpoint", name: "coolSetpoint" });
-		this.drivers.CLIMD = Driver.create("CLIMD", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.InsteonThermostatMode, label: "Mode", name: "mode" });
-		this.drivers.CLIFS = Driver.create("CLIFS", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.InsteonThermostatFanMode, label: "Fan Mode", name: "fanMode" });
-		this.drivers.CLIHUM = Driver.create("CLIHUM", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Humidity", name: "humidity" });
-		this.drivers.CLIHCS = Driver.create("CLIHCS", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.ThermostatHeatCoolState, label: "Heat/Cool State", name: "heatCoolState" });
-		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.Degree, label: "Temperature", name: "temperature" });
+		this.drivers.CLISPH = Driver.create("CLISPH", this, nodeInfo.state['CLISPH'], { uom: UnitOfMeasure.Degree, label: "Heat Setpoint", name: "heatSetpoint" });
+		this.drivers.CLISPC = Driver.create("CLISPC", this, nodeInfo.state['CLISPC'], { uom: UnitOfMeasure.Degree, label: "Cool Setpoint", name: "coolSetpoint" });
+		this.drivers.CLIMD = Driver.create("CLIMD", this, nodeInfo.state['CLIMD'], { uom: UnitOfMeasure.InsteonThermostatMode, label: "Mode", name: "mode" });
+		this.drivers.CLIFS = Driver.create("CLIFS", this, nodeInfo.state['CLIFS'], { uom: UnitOfMeasure.InsteonThermostatFanMode, label: "Fan Mode", name: "fanMode" });
+		this.drivers.CLIHUM = Driver.create("CLIHUM", this, nodeInfo.state['CLIHUM'], { uom: UnitOfMeasure.Percent, label: "Humidity", name: "humidity" });
+		this.drivers.CLIHCS = Driver.create("CLIHCS", this, nodeInfo.state['CLIHCS'], { uom: UnitOfMeasure.ThermostatHeatCoolState, label: "Heat/Cool State", name: "heatCoolState" });
+		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
 	async updateHeatSetpoint(value: number) { return this.sendCommand("CLISPH", value); }
 	async updateCoolSetpoint(value: number) { return this.sendCommand("CLISPC", value); }
@@ -84,13 +84,12 @@ NodeFactory.register(TempLincNode);
 
 export namespace TempLinc {
 	export interface Interface extends Omit<InstanceType<typeof TempLincNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "TempLinc";
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is TempLincNode {
-		return ["TempLinc"].includes(node.nodeDefId);
+		return ['TempLinc'].includes(node.nodeDefId);
 	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is TempLincNode {
-		return ["TempLinc", "Thermostat"].includes(node.nodeDefId);
+		return ['TempLinc', "Thermostat"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new TempLincNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/Thermostat.ts

@@ -17,7 +17,7 @@ const nodeDefId = "Thermostat";
 type Commands = Thermostat.Commands;
 type Drivers = Thermostat.Drivers;
 
-export class ThermostatNode extends Base<Drivers, Commands> implements Thermostat.Interface {
+class ThermostatNode extends Base<Drivers, Commands> implements Thermostat.Interface {
 	public override readonly commands = {
 		CLISPH: this.updateHeatSetpoint,
 		CLISPC: this.updateCoolSetpoint,
@@ -31,18 +31,18 @@ export class ThermostatNode extends Base<Drivers, Commands> implements Thermosta
 		WDU: this.writeChanges
 	};
 	static override nodeDefId = "Thermostat";
-	static override implements = ["Thermostat"];
-	declare readonly nodeDefId: "Thermostat";
+	static override implements = ['Thermostat'];
+	declare readonly nodeDefId: 'Thermostat';
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Degree, label: "Temperature", name: "temperature" });
-		this.drivers.CLISPH = Driver.create("CLISPH", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Degree, label: "Heat Setpoint", name: "heatSetpoint" });
-		this.drivers.CLISPC = Driver.create("CLISPC", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Degree, label: "Cool Setpoint", name: "coolSetpoint" });
-		this.drivers.CLIMD = Driver.create("CLIMD", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.InsteonThermostatMode, label: "Mode", name: "mode" });
-		this.drivers.CLIFS = Driver.create("CLIFS", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.InsteonThermostatFanMode, label: "Fan Mode", name: "fanMode" });
-		this.drivers.CLIHUM = Driver.create("CLIHUM", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Humidity", name: "humidity" });
-		this.drivers.CLIHCS = Driver.create("CLIHCS", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.ThermostatHeatCoolState, label: "Heat/Cool State", name: "heatCoolState" });
-		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.Degree, label: "Temperature", name: "temperature" });
+		this.drivers.CLISPH = Driver.create("CLISPH", this, nodeInfo.state['CLISPH'], { uom: UnitOfMeasure.Degree, label: "Heat Setpoint", name: "heatSetpoint" });
+		this.drivers.CLISPC = Driver.create("CLISPC", this, nodeInfo.state['CLISPC'], { uom: UnitOfMeasure.Degree, label: "Cool Setpoint", name: "coolSetpoint" });
+		this.drivers.CLIMD = Driver.create("CLIMD", this, nodeInfo.state['CLIMD'], { uom: UnitOfMeasure.InsteonThermostatMode, label: "Mode", name: "mode" });
+		this.drivers.CLIFS = Driver.create("CLIFS", this, nodeInfo.state['CLIFS'], { uom: UnitOfMeasure.InsteonThermostatFanMode, label: "Fan Mode", name: "fanMode" });
+		this.drivers.CLIHUM = Driver.create("CLIHUM", this, nodeInfo.state['CLIHUM'], { uom: UnitOfMeasure.Percent, label: "Humidity", name: "humidity" });
+		this.drivers.CLIHCS = Driver.create("CLIHCS", this, nodeInfo.state['CLIHCS'], { uom: UnitOfMeasure.ThermostatHeatCoolState, label: "Heat/Cool State", name: "heatCoolState" });
+		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
 	async updateHeatSetpoint(value: number) { return this.sendCommand("CLISPH", value); }
 	async updateCoolSetpoint(value: number) { return this.sendCommand("CLISPC", value); }
@@ -84,13 +84,12 @@ NodeFactory.register(ThermostatNode);
 
 export namespace Thermostat {
 	export interface Interface extends Omit<InstanceType<typeof ThermostatNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "Thermostat";
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is ThermostatNode {
-		return ["Thermostat"].includes(node.nodeDefId);
+		return ['Thermostat'].includes(node.nodeDefId);
 	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is ThermostatNode {
-		return ["Thermostat"].includes(node.nodeDefId);
+		return ['Thermostat'].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new ThermostatNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/X10.ts

@@ -17,7 +17,7 @@ const nodeDefId = "X10";
 type Commands = X10.Commands;
 type Drivers = X10.Drivers;
 
-export class X10Node extends Base<Drivers, Commands> implements X10.Interface {
+class X10Node extends Base<Drivers, Commands> implements X10.Interface {
 	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
@@ -26,12 +26,12 @@ export class X10Node extends Base<Drivers, Commands> implements X10.Interface {
 		QUERY: this.query
 	};
 	static override nodeDefId = "X10";
-	static override implements = ["X10"];
-	declare readonly nodeDefId: "X10";
+	static override implements = ['X10'];
+	declare readonly nodeDefId: 'X10';
 	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() { return this.sendCommand("DON"); }
 	async off() { return this.sendCommand("DOF"); }
@@ -50,13 +50,12 @@ NodeFactory.register(X10Node);
 
 export namespace X10 {
 	export interface Interface extends Omit<InstanceType<typeof X10Node>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "X10";
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is X10Node {
-		return ["X10"].includes(node.nodeDefId);
+		return ['X10'].includes(node.nodeDefId);
 	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is X10Node {
-		return ["X10"].includes(node.nodeDefId);
+		return ['X10'].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new X10Node(isy, nodeInfo);

package/src/Devices/Insteon/InsteonDeviceFactory.ts

@@ -14,6 +14,7 @@ import { DeviceDef, type CategoryDef, type FamilyDef } from '../DeviceMap.js';
 import { writeFileSync } from 'fs';
 import type { Constructor } from '../Constructor.js';
 import { Family } from '../../Definitions/index.js';
+import type { ISYDevice } from '../../ISYDevice.js';
 
 
 
@@ -63,17 +64,30 @@ export class InsteonDeviceFactory {
 	// 	writeFileSync("DeviceMapClean.json", JSON.stringify(fams));
 	// }
 
-	static getDeviceDetails(node: NodeInfo): { name: string; modelNumber?: string; version?: string; class?: Constructor<ISYNode<Family.Insteon,any,any>>; unsupported?: true; } {
+	static getDeviceDetails(node: NodeInfo): { name: string; modelNumber?: string; version?: string; class?: Constructor<ISYNode<Family.Insteon,any,any>> | Constructor<ISYDevice<Family.Insteon,any,any,any>>; unsupported?: true; } {
 		const family = Number(node.family ?? '1');
 		//let insteonFamilyDef = s[0] as FamilyDef<Family.Insteon>;
 		if ((family ?? Family.Insteon) === Family.Insteon) {
-			//insteonFamilyDef.categories.forEach(callbackfn)
-			return this.getInsteonDeviceDetails(node);
+			//insteonFamilyDef.categories.forEach(callbackfn))
+			let n = this.getInsteonDeviceDetails(node);
+			if(n.class)
+			{
+				if('Node' in n.class)
+				{
+					return {...n, class: n.class.Node};
+				}
+				if ('Device' in n.class) {
+					return { ...n, class: n.class.Device };
+				}
+				if (n.class instanceof Function) {
+					return n as any;
+				}
+			}
 
-		} else { return { name: "Unsupported Device", class: Insteon.Base, unsupported: true }; }
+		} return { name: "Unsupported Device", class: Insteon.Base, unsupported: true };
 	}
 
-	public static getInsteonDeviceDetails(node: NodeInfo): { name: string; modelNumber?: string; version?: string; class: Constructor<ISYNode<Family.Insteon,any,any>>; unsupported?: true; } {
+	public static getInsteonDeviceDetails(node: NodeInfo): { name: string; modelNumber?: string; version?: string; class: {Node: Constructor<ISYNode<Family.Insteon,any,any>>} | {Device: Constructor<ISYDevice<Family.Insteon,any,any,any>>} | Constructor<ISYNode<Family.Insteon,any,any>>, unsupported?: true; } {
 		const type = parseTypeCode(node.type as any);
 		const subAddress = node.address.split(' ').pop();
 
@@ -173,7 +187,7 @@ export class InsteonDeviceFactory {
 
 	public static getSwitchLightInfo(deviceCode: number, subAddress: string): { name: string; modelNumber?: string; version?: string; class?: typeof Insteon.RelayLampSwitch.Node | typeof Insteon.KeypadRelay.Node | typeof Insteon.KeypadButton.Node | typeof Insteon.OnOffOutlet; } {
 		const c = String.fromCharCode(deviceCode);
-		let retVal = { name: 'Generic Insteon Relay', class: Insteon.RelayLampSwitch.Node } as { name: string; modelNumber?: string; version?: string; class?: typeof Insteon.RelayLampSwitch.Node | typeof Insteon.KeypadRelay.Node | typeof Insteon.KeypadButton.Node | typeof Insteon.OnOffOutlet; };
+		let retVal = { name: 'Generic Insteon Relay'} as { name: string; modelNumber?: string; version?: string; class?: typeof Insteon.RelayLampSwitch.Node | typeof Insteon.KeypadRelay.Node | typeof Insteon.KeypadButton.Node | typeof Insteon.OnOffOutlet; };
 		switch (c) {
 			case String.fromCharCode(6):
 				retVal = { name: 'ApplianceLinc - Outdoor Plugin Module', modelNumber: '2456S3E' };
@@ -330,7 +344,7 @@ export class InsteonDeviceFactory {
 
 	private static getDimLightInfo(deviceCode: number, subAddress: string, node: NodeInfo): { name: string; modelNumber?: string; version?: string; class?: Constructor<ISYNode<Family.Insteon,any,any>>; } {
 		const c = String.fromCharCode(deviceCode);
-		let retVal = { name: "Generic Insteon Dimmer", class: Insteon.DimmerLamp.Node } as {
+		let retVal = { name: "Generic Insteon Dimmer" } as {
       name: string;
       modelNumber?: string;
       version?: string;
@@ -447,7 +461,7 @@ export class InsteonDeviceFactory {
 				break;
 			case '.':
 
-				retVal = { name: 'FanLinc', modelNumber: '2475F', class: Insteon.Fan };
+				retVal = { name: 'FanLinc', modelNumber: '2475F', class: Insteon.Fan as any};
 				break;
 			case '!':
 				retVal = { name: 'Dual Band OutletLinc Dimmer', modelNumber: '2472D', class: Insteon.DimmerOutlet };
@@ -697,15 +711,15 @@ export class InsteonDeviceFactory {
 				retVal = { name: 'TriggerLinc', modelNumber: '2421', class: Insteon.DoorWindowSensor };
 				break;
 			case '\t':
-				retVal = { name: 'Open/Close Sensor', modelNumber: '2843-222', class: Insteon.DoorWindowSensor };
+				retVal = { name: 'Open/Close Sensor', modelNumber: '2843-222', class: Insteon.DoorWindowSensor.Device };
 				break;
 			case String.fromCharCode(6):
-				retVal = { name: 'Open/Close Sensor', modelNumber: '2843-422', class: Insteon.DoorWindowSensor };
+				retVal = { name: 'Open/Close Sensor', modelNumber: '2843-422', class: Insteon.DoorWindowSensor.Device };
 				break;
 			case String.fromCharCode(7):
 				break;
 			case String.fromCharCode(25):
-				retVal = { name: 'Open/Close Sensor', modelNumber: '2843-522', class: Insteon.DoorWindowSensor };
+				retVal = { name: 'Open/Close Sensor', modelNumber: '2843-522', class: Insteon.DoorWindowSensor.Device };
 				break;
 			case '\b':
 				retVal = { name: 'Leak Sensor', modelNumber: '2852-222', class: Insteon.LeakSensor };
@@ -827,7 +841,7 @@ export class InsteonDeviceFactory {
 
 	private static getAccessControlInfo(deviceCode: number): { name: string; modelNumber?: string; version?: string; class?: Constructor<ISYNode<any,any,any,any>>; } {
 		const c = String.fromCharCode(deviceCode);
-		const retVal = { name: '', modelNumber: '', class: Insteon.Lock };
+		const retVal = { name: '', modelNumber: '', class: Insteon.DoorLock.Node };
 		switch (c) {
 			case String.fromCharCode(6):
 				retVal.name = 'MorningLinc';

package/src/Devices/Insteon/InsteonDimmableDevice.ts

@@ -7,7 +7,8 @@ import type { DimmableLightRequirements } from '@project-chip/matter.js/devices/
 import { OnOffBehavior as OOB } from '@project-chip/matter.js/behaviors/on-off';
 import 'winston';
 import type { NodeInfo } from '../../Model/NodeInfo.js';
-import { DimmerLampSwitchNode } from './Generated/DimmerLampSwitch.js';
+import { DimmerLampSwitch } from './Generated/DimmerLampSwitch.js';
+
 
 
 // #region Type aliases (2)
@@ -19,13 +20,12 @@ type OnOffBehavior = typeof OOB;
 
 // #region Classes (1)
 
-//@ts-ignore
-export class InsteonDimmableDevice extends DimmerLampSwitchNode{
+export class InsteonDimmableDevice extends DimmerLampSwitch.Node {
 	// #region Constructors (1)
 
 	constructor(isy: ISY, node: NodeInfo) {
 		super(isy, node);
-		this.isDimmable = true;
+
 	}
 
 	// #endregion Constructors (1)

package/src/Devices/Insteon/InsteonDimmerOutletDevice.ts

@@ -1,8 +1,9 @@
 import type { NodeInfo } from '../../Model/NodeInfo.js';
 import type { ISY } from '../../ISY.js';
-import { DimmerLampNode } from './Generated/DimmerLamp.js';
+import { DimmerLamp } from './Generated/DimmerLamp.js';
 
-export class InsteonDimmerOutletDevice extends DimmerLampNode {
+
+export class InsteonDimmerOutletDevice extends DimmerLamp.Node{
 	constructor (isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 	}

package/src/Devices/Insteon/InsteonDoorWindowSensorDevice.ts

@@ -1,18 +1,41 @@
 import type { NodeInfo } from '../../Model/NodeInfo.js';
-import { ISY } from '../../ISY.js';
+import type { ISY } from '../../ISY.js';
 import { ISYBinaryStateDevice } from '../ISYDevice.js';
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 import 'winston';
+import { BinaryAlarm } from './Generated/BinaryAlarm.js';
+import { CompositeDevice } from '../CompositeDevice.js';
+import { nodeDefId } from './KeypadButton.js';
+import { OnLevelRelay } from '../../Definitions/Insteon/index.js';
+import { NodeFactory } from '../NodeFactory.js';
+import type { Family } from '../../Definitions/index.js';
 
-export class InsteonDoorWindowSensorDevice extends InsteonBaseDevice {
 
+const nodes = {
+	contactSensor:  BinaryAlarm.Node,
+	heartbeat:  BinaryAlarm.Node,
+	lowBattery:  BinaryAlarm.Node
+}
+//@ts-ignore
+export class DoorWindowSensorDevice extends CompositeDevice.of(nodes, {contactSensor: 1, heartbeat: 3, lowBattery: 4} )
+{
+
+	constructor (isy: ISY, ...node: NodeInfo[]) {
+		super(isy, ...node);
 
-	constructor (isy: ISY, deviceNode: NodeInfo) {
-		super(isy, deviceNode);
 
 
 	}
-	get isOpen() {
-		return this.drivers.ST.value === 0;
-	}
+
+}
+
+export namespace DoorWindowSensor {
+	export class Device extends DoorWindowSensorDevice { }
+
+	export const ContactSensor = BinaryAlarm;
+
+	export const Heartbeat = BinaryAlarm;
+
+	export const LowBattery = BinaryAlarm;
+
 }

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -1,30 +1,33 @@
 import { Family } from '../../Definitions/Global/Families.js';
 import { ISY } from '../../ISY.js';
 
-
 import 'winston';
 import { Command, Driver, UnitOfMeasure } from '../../Definitions/index.js';
 import type { DriverState } from '../../Model/DriverState.js';
 import type { NodeInfo, StaticNodeInfo } from '../../Model/NodeInfo.js';
+import { CompositeDevice, CompositeOf } from '../CompositeDevice.js';
+import { DimmerLamp } from './Generated/DimmerLamp.js';
+import { FanLincMotor } from './Generated/FanLincMotor.js';
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
 
-export class InsteonFanMotorDevice extends InsteonBaseDevice<Driver.Signatures<'ST'>, Command.Signatures<'DON' | 'DOF'>> {
+export class InsteonFanMotorDevice extends FanLincMotor.Node {
 	constructor(isy: ISY, deviceNode: StaticNodeInfo) {
 		super(isy, deviceNode);
-		this.drivers.ST = Driver.create('ST', this, deviceNode.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Fan Speed (%)', name: 'fanSpeed' });
+		//*this.drivers. == Driver.create('ST', this, deviceNode.property as DriverState, { uom: UnitOfMeasure.Percent, label: 'Fan Speed (%)', name: 'fanSpeed' });
 		this.hidden = true;
+
 	}
 
 	get isOn() {
-		return this.drivers.ST.value !== 0;
+		return this.status !== 0;
 	}
 	get fanSpeed() {
-		return this.drivers.ST.value;
+		return this.status;
 	}
 
 	public async updateFanSpeed(level: number) {
-		return level;
+		return this.on(level);
 	}
 	public async updateIsOn(isOn: boolean) {
 		if (!isOn) {
@@ -35,40 +38,22 @@ export class InsteonFanMotorDevice extends InsteonBaseDevice<Driver.Signatures<'
 	}
 }
 
-export class InsteonFanDevice extends InsteonBaseDevice {
-	public light?: InsteonDimmableDevice;
-	public motor: InsteonFanMotorDevice;
+export class FanDevice extends CompositeDevice.of({ light: DimmerLamp.Node, motor: FanLincMotor.Node }, {light: 1, motor: 2}) {
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
-		this.light = new InsteonDimmableDevice(isy, deviceNode);
+
+
 		/*this.light.events.on('PropertyChanged', ((a: any, b: any, c: any, d: string) => { this.emit('PropertyChanged', `light.${a}`, b, c, d); }).bind(this));*/
-		this.addChild(this.light);
 	}
+}
 
-	public override handleEvent(event: { control?: string; data?: any; node?: any }): boolean {
-		this.logger(JSON.stringify(event));
-		const child = this.children.find((p) => p.address === event.node);
-		if (child !== undefined) {
-			return child.handleEvent(event);
-		}
-		return false;
-	}
 
-	public override addChild(childDevice) {
-		super.addChild(childDevice);
-		if (childDevice instanceof InsteonFanMotorDevice) {
-			this.logger('Fan Motor Found');
-			this.motor = childDevice as InsteonFanMotorDevice;
-			this.motor.events.on(
-				'statusChanged',
-				((a: any, b: any, c: any, d: string) => {
-					this.emit('propertyChanged', `motor.${a}`, b, c, d);
-				}).bind(this)
-			);
-		}
-	}
+export namespace Fan {
+	export class Device extends FanDevice { }
 
-	public async updateFanSpeed(level: number) {
-		return this.motor.updateFanSpeed(level);
-	}
-}
+	export const Motor = FanLincMotor;
+
+	export const Light = DimmerLamp;
+
+
+}

package/src/Devices/Insteon/InsteonOnOffOutletDevice.ts

@@ -1,24 +1,12 @@
-import type { NodeInfo } from '../../Model/NodeInfo.js';
+import 'winston';
 import { ISY } from '../../ISY.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { RelayLamp } from './Generated/RelayLamp.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
-import 'winston';
-
-export class InsteonOnOffOutletDevice extends InsteonRelayDevice {
-
-	public outlet1: InsteonRelayDevice;
-	public outlet2: InsteonRelayDevice;
+import { CompositeDevice, CompositeOf } from '../CompositeDevice.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);
-		this.outlet1 = new InsteonRelayDevice(isy, deviceNode);
-		//this.outlet1.on('PropertyChanged',(p,v,f) => this.handlePropertyChange("outlet1."+ p, v, f));
-		super.addChild(this.outlet1);
-
-	}
-	public override addChild(childDevice) {
-		super.addChild(childDevice);
-		this.outlet2 = childDevice as InsteonRelayDevice;
-		//this.outlet2.on('PropertyChanged', (p, v, f) => this.//handlePropertyChange("outlet2." + p, v, f));
-		// if(childDevice)
 	}
 }

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -15,6 +15,7 @@ export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 
+
 	}
 
 	// #endregion Constructors (1)
@@ -34,9 +35,7 @@ export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice
 		}
 
 	} */
-	public override async sendBeep(level: number = 100): Promise<any> {
-		return super.beep(level);
-	}
+
 
 	// #endregion Public Methods (2)
 }

package/src/Devices/Insteon/index.ts

@@ -1,31 +1,27 @@
-
 //import Base from "./InsteonBaseDevice.js"
 
+export { InsteonBaseDevice as Base } from './InsteonBaseDevice.js';
 
-
-export {InsteonBaseDevice as Base} from  "./InsteonBaseDevice.js";
-
-export {InsteonOnOffOutletDevice as OnOffOutlet} from "./InsteonOnOffOutletDevice.js";
+export { OnOffOutlet as OnOffOutlet } from './InsteonOnOffOutletDevice.js';
 
 export * from './Generated/index.js';
 
-export {InsteonDimmableDevice as Dimmable} from "./InsteonDimmableDevice.js";
+export { InsteonDimmableDevice as Dimmable } from './InsteonDimmableDevice.js';
 
-export {InsteonFanDevice as Fan} from "./InsteonFanDevice.js";
+export { Fan as Fan } from './InsteonFanDevice.js';
 
-export {InsteonLockDevice as Lock} from "./InsteonLockDevice.js";
 
-export {InsteonRelayDevice as Relay} from "./InsteonRelayDevice.js";
+export { InsteonRelayDevice as Relay } from './InsteonRelayDevice.js';
 
-export {InsteonLeakSensorDevice as LeakSensor} from "./InsteonLeakSensorDevice.js";
+export { InsteonLeakSensorDevice as LeakSensor } from './InsteonLeakSensorDevice.js';
 
-export {InsteonMotionSensorDevice as MotionSensor} from "./InsteonMotionSensorDevice.js";
+export { InsteonMotionSensorDevice as MotionSensor } from './InsteonMotionSensorDevice.js';
 
-export {InsteonSmokeSensorDevice as SmokeSensor} from "./InsteonSmokeSensorDevice.js";
+export { InsteonSmokeSensorDevice as SmokeSensor } from './InsteonSmokeSensorDevice.js';
 
-export {InsteonDoorWindowSensorDevice as DoorWindowSensor} from "./InsteonDoorWindowSensorDevice.js";
+export { DoorWindowSensor } from './InsteonDoorWindowSensorDevice.js';
 
-export {InsteonDimmerOutletDevice as DimmerOutlet} from "./InsteonDimmerOutletDevice.js";
+export { InsteonDimmerOutletDevice as DimmerOutlet } from './InsteonDimmerOutletDevice.js';
 
 /*export const Insteon = {
   LeakSensor: InsteonLeakSensorDevice,