isy-nodejs 1.0.1-alpha.6 → 1.0.2-alpha.0

package/src/Devices/Elk/ElkAlarmPanelDevice.ts

@@ -90,21 +90,21 @@ export class ELKAlarmPanelDevice extends ISYDeviceNode<Family.Global,any,any> {
 				if (this.alarmTripState !== valueToSet) {
 					const oldVal = this.alarmTripState;
 					this.alarmTripState = valueToSet;
-					this.emit('PropertyChanged', 'alarmTripState', this.alarmTripState, oldVal, AlarmTripState[this.alarmTripState]);
+					this.emit('propertyChanged', 'alarmTripState', this.alarmTripState, oldVal, AlarmTripState[this.alarmTripState]);
 					valueChanged = true;
 				}
 			} else if (updateType === AlarmPanelProperty.AlarmState) {
 				if (this.alarmState !== valueToSet) {
 					const oldVal = this.alarmState;
 					this.alarmState = valueToSet;
-					this.emit('PropertyChanged', 'alarmState', this.alarmState, oldVal, AlarmState[this.alarmState]);
+					this.emit('propertyChanged', 'alarmState', this.alarmState, oldVal, AlarmState[this.alarmState]);
 					valueChanged = true;
 				}
 			} else if (updateType === AlarmPanelProperty.AlarmMode) {
 				if (this.alarmMode !== valueToSet) {
 					const oldVal = this.alarmMode;
 					this.alarmMode = valueToSet;
-					this.emit('PropertyChanged', 'alarmMode', this.alarmState, oldVal, AlarmMode[this.alarmMode]);
+					this.emit('propertyChanged', 'alarmMode', this.alarmState, oldVal, AlarmMode[this.alarmMode]);
 					valueChanged = true;
 				}
 			}

package/src/Devices/Elk/ElkAlarmSensorDevice.ts

@@ -1,4 +1,3 @@
-
 import { Family } from '../../Definitions/Global/Families.js';
 import { ISY } from '../../ISY.js';
 import { ISYDeviceNode } from '../ISYDeviceNode.js';
@@ -6,7 +5,7 @@ import { AlarmSensorPhysicalState, AlarmSensorLogicalState } from './ElkAlarmPan
 /////////////////////////////
 // ELKAlarmSensor
 //
-export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
+export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global, any, any> {
 	[x: string]: any;
 	public area: number;
 	public zone: string;
@@ -17,9 +16,12 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 	public physicalState: AlarmSensorPhysicalState;
 	public logicalState: AlarmSensorLogicalState;
 	public voltage: number;
-	constructor (isy: ISY, name: string, area: number, zone: string) {
+	constructor(isy: ISY, name: string, area: number, zone: string) {
 		super(isy, {
-			family: Family.Global, name, address: `ElkZone_${zone}`, enabled: true,
+			family: Family.Global,
+			name,
+			address: `ElkZone_${zone}`,
+			enabled: true,
 			pnode: undefined,
 			startDelay: 0,
 			hint: '',
@@ -49,13 +51,13 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 		return this.physicalState;
 	}
 	public isBypassed() {
-		return (this.logicalState === 3);
+		return this.logicalState === 3;
 	}
 	public getLogicalState() {
 		return this.logicalState;
 	}
 	public getCurrentDoorWindowState() {
-		return (this.physicalState === this.SENSOR_STATE_PHYSICAL_OPEN || this.logicalState === this.SENSOR_STATE_LOGICAL_VIOLATED);
+		return this.physicalState === this.SENSOR_STATE_PHYSICAL_OPEN || this.logicalState === this.SENSOR_STATE_LOGICAL_VIOLATED;
 	}
 	public getSensorStatus() {
 		return 'PS [' + this.physicalState + '] LS [' + this.logicatState + ']';
@@ -63,17 +65,11 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 	public isPresent() {
 		if (this.voltage < 65 || this.voltage > 80) {
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
-	public override handleEvent(event: {
-		control?: string;
-		data?: any;
-		node?: any;
-		eventInfo?: any;
-	}) {
+	public override handleEvent(event: { control?: string; data?: any; node?: any; eventInfo?: any }) {
 		const zoneUpdate = event.eventInfo.ze;
 		const zone = zoneUpdate.attr.zone;
 		const updateType = zoneUpdate.attr.type;
@@ -84,24 +80,22 @@ export class ElkAlarmSensorDevice extends ISYDeviceNode<Family.Global,any,any> {
 				if (this.logicalState !== valueToSet) {
 					const temp = this.logicalState;
 					this.logicalState = valueToSet;
-					this.emit('PropertyChanged', 'logicalState', this.logicalState, temp, this.voltage.toString());
+					this.emit('propertyChanged', 'logicalState', this.logicalState, temp, this.voltage.toString());
 					// Not triggering change update on logical state because physical always follows and don't want double notify.
 					// valueChanged = true;
 				}
-			}
-			else if (updateType === 52) {
+			} else if (updateType === 52) {
 				if (this.physicalState !== valueToSet) {
 					const temp = this.physicalState;
 					this.physicalState = valueToSet;
-					this.emit('PropertyChanged', 'physicalState', this.physicalState, temp, this.voltage.toString());
+					this.emit('propertyChanged', 'physicalState', this.physicalState, temp, this.voltage.toString());
 					valueChanged = true;
 				}
-			}
-			else if (updateType === 53) {
+			} else if (updateType === 53) {
 				if (this.voltage !== valueToSet) {
 					const temp = this.voltage;
 					this.voltage = valueToSet;
-					this.emit('PropertyChanged', 'voltage', this.voltage, temp, this.voltage.toString());
+					this.emit('propertyChanged', 'voltage', this.voltage, temp, this.voltage.toString());
 					valueChanged = true;
 				}
 			}

package/src/Devices/EndpointFor.ts

@@ -23,13 +23,15 @@ export type RelaxTypes<V> = V extends number
             : V;
 
 export type RelaxedClusterType = RelaxTypes<ClusterType>
-
+//@ts-ignore
 export type EndpointFor<K extends Behavior.Type, K1 extends Behavior.Type = K, K2 extends Behavior.Type = K, K3 extends Behavior.Type = K> = { events: SupportedBehaviors.EventsOf<SupportedBehaviors.MapOf<[K, K1, K2, K3]>>} & MutableEndpoint.With<EndpointType.Empty, SupportedBehaviors.MapOf<[K, K1, K2, K3]>>
 
 /*set: (values: SupportedBehaviors.StatePatchOf<SupportedBehaviors.MapOf<[K, K1, K2]>>) => void; }*/
 export type BehaviorsOf <K extends ClusterType.Of<ClusterType.Options<{}>>, K1 extends ClusterType = K, K2 extends ClusterType = K, K3 extends ClusterType = K> = [ClusterBehavior.Type<K>,ClusterBehavior.Type<K1>,ClusterBehavior.Type<K2>,ClusterBehavior.Type<K3>]
-
+//@ts-ignore
+//@ts-ignore
 export type SupportedBehaviorsOf <K extends ClusterType.Of<ClusterType.Options<{}>>, K1 extends ClusterType = K, K2 extends ClusterType = K, K3 extends ClusterType = K> =
+//@ts-ignore
 SupportedBehaviors.MapOf<BehaviorsOf<K, K1,K2,K3>>
 
 export type EndpointForCluster<K extends ClusterType.Of<ClusterType.Options<{}>>, K1 extends ClusterType = K, K2 extends ClusterType = K, K3 extends ClusterType = K> = { events: SupportedBehaviors.EventsOf<SupportedBehaviorsOf<K,K1,K2,K3>>; set: (values: SupportedBehaviors.StatePatchOf<SupportedBehaviorsOf<K, K1, K2,K3>>) => void; }
@@ -46,22 +48,22 @@ export const MatterEndpoint= <P extends EndpointType & MutableEndpoint, T extend
 
 
 		createEndpoint<K extends SupportedBehaviors>() : Endpoint {
-
+			//@ts-ignore
 			var p = this.endpointType.with(BridgedDeviceBasicInformationServer);
 
-		 	const id = this.address.replaceAll(' ', '_').replaceAll('.', ' ');
-
-			return new Endpoint(p,{id: id, address: this.address, bridgedDeviceBasicInformation: {
-
-				nodeLabel: this.label.rightWithToken(32,' '),
-                productName: this.productName.rightWithToken(32,' '),
-                productLabel: this.model.leftWithToken(64,' '),
-                serialNumber: id,
-                reachable: this.enabled,
-            }});
-
-
-
+			const id = this.address.replaceAll(' ', '_').replaceAll('.', ' ');
+			//@ts-ignore
+			return new Endpoint(p, {
+				id: id,
+				address: this.address,
+				bridgedDeviceBasicInformation: {
+					nodeLabel: this.label.rightWithToken(32, ' '),
+					productName: this.productName.rightWithToken(32, ' '),
+					productLabel: this.model.leftWithToken(64, ' '),
+					serialNumber: id,
+					reachable: this.enabled
+				}
+			});
 		}
 
 

package/src/Devices/ISYDevice.ts

@@ -1,10 +1,7 @@
 
-import { Commands, States } from '../ISYConstants.js';
-import { EndpointType, MutableEndpoint } from '@project-chip/matter.js/endpoint/type';
-import { Endpoint } from '@project-chip/matter.js/endpoint';
-import { BridgedDeviceBasicInformationServer } from '@project-chip/matter.js/behaviors/bridged-device-basic-information';
-import { SupportedBehaviors } from '@project-chip/matter.js/endpoint/properties';
 import { ClusterBehavior } from '@project-chip/matter.js/behavior/cluster';
+import type { Endpoint, EndpointType, MutableEndpoint } from '@project-chip/matter.js/endpoint';
+import type { SupportedBehaviors } from '@project-chip/matter.js/endpoint/properties';
 import 'winston'
 
 
@@ -100,7 +97,7 @@ export interface MapsToEndpointType<T extends EndpointType>  {
 type BehaviorList<T extends ClusterBehavior> = SupportedBehaviors & T;
 
 export interface MapsToEndpoint<T extends ClusterBehavior>
-{
+{//@ts-ignore
 	initialize<K extends MutableEndpoint.With<EndpointType.Empty,BehaviorList<T>>>(endpoint: Endpoint<K>): void;
 
 }

package/src/Devices/ISYDeviceNode.ts

@@ -1,6 +1,6 @@
 
 import type { Driver } from '../Definitions/Global/Drivers.js';
-import { type Family, type ISY, Controls } from '../ISY.js';
+import {type ISY } from '../ISY.js';
 import type { ISYDevice } from '../ISYDevice.js';
 import { ISYNode} from '../ISYNode.js';
 import type { ISYScene } from '../ISYScene.js';
@@ -10,7 +10,22 @@ import type { Category } from '../Definitions/Global/Categories.js';
 import type { Command } from '../Definitions/Global/Commands.js';
 import type { Event } from '../Definitions/Global/Events.js';
 import type { StringKeys } from '../Utils.js';
+import type { Family } from '../Definitions/index.js';
 
+export interface ISYDeviceInfo
+{
+	type: string;
+	deviceClass: any;
+
+	productName: string;
+
+	productId: string | number;
+
+	modelName: string;
+
+	modelNumber: string;
+
+}
 
 export class ISYDeviceNode<
   T extends Family,
@@ -18,7 +33,7 @@ export class ISYDeviceNode<
   C extends ISYNode.CommandSignatures,
   E extends ISYNode.EventSignatures = {[x in keyof D]: Event.DriverToEvent<D[x]> & {driver: x}} & {[x in keyof C]: Event.CommandToEvent<C[x]> & {command: x}}
 >
-  extends ISYNode<T, D, C, E>
+  extends ISYNode<T, D, C, E> implements ISYDeviceInfo
    {
   public declare family: T;
 
@@ -85,6 +100,8 @@ export class ISYDeviceNode<
     //   );
     // }
   }
+	productId: string | number;
+	modelName: string;
 
   _parentDevice: ISYDevice<T, any, any, any>;
   children: ISYNode<any, any, any, any>[];

package/src/Devices/ISYMultiNodeDevice.ts

@@ -1,7 +1,7 @@
 //import type { UnionToIntersection } from '@project-chip/matter-node.js/util.js';
 import type { Driver } from '../Definitions/Global/Drivers.js';
 import type { UnitOfMeasure } from '../Definitions/Global/UOM.js';
-import type { Family } from '../ISY.js';
+
 import type { ISYDevice } from '../ISYDevice.js';
 import type { DriverMap, ISYNode, NodeList } from '../ISYNode.js';
 import type { ISYScene } from '../ISYScene.js';

package/src/Devices/Insteon/DimmerLampSwitch.ts

@@ -0,0 +1,207 @@
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
+import { Driver } from '../../Definitions/Global/Drivers.js';
+import { Family } from '../../Definitions/Global/Families.js';
+import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
+import { Insteon } from '../../Definitions/index.js';
+import type { ISY } from '../../ISY.js';
+import type { ISYNode } from '../../ISYNode.js';
+import type { DriverState } from '../../Model/DriverState.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { ISYDeviceNode } from '../ISYDeviceNode.js';
+import { NodeFactory } from '../NodeFactory.js';
+import { InsteonBaseDevice as Base } from './InsteonBaseDevice.js';
+
+export const nodeDefId = 'DimmerLampSwitch';
+
+type Commands = DimmerLampSwitch.Commands;
+type Drivers = DimmerLampSwitch.Drivers;
+
+export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements DimmerLampSwitch.Interface {
+	public override readonly commands = {
+		DON: this.on,
+		DOF: this.off,
+		DFOF: this.fastOff,
+		DFON: this.fastOn,
+		BRT: this.brighten,
+		DIM: this.dim,
+		FDUP: this.fadeUp,
+		FDDOWN: this.fadeDown,
+		FDSTOP: this.fadeStop,
+		QUERY: this.query,
+		BEEP: this.beep,
+		OL: this.updateOnLevel,
+		RR: this.updateRampRate,
+		BL: this.backlight,
+		WDU: this.writeChanges
+	};
+	static override nodeDefId = 'DimmerLampSwitch';
+	declare readonly nodeDefId: 'DimmerLampSwitch';
+	constructor(isy: ISY, nodeInfo: NodeInfo) {
+		super(isy, nodeInfo);
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.LevelFrom0To255, label: 'Status', name: 'status' });
+		this.drivers.OL = Driver.create('OL', this, nodeInfo.state['OL'] as DriverState, { uom: UnitOfMeasure.Percent, label: 'On Level', name: 'onLevel' });
+		this.drivers.RR = Driver.create('RR', this, nodeInfo.state['RR'] as DriverState, { uom: UnitOfMeasure.Index, label: 'Ramp Rate', name: 'rampRate' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'] as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
+	}
+	async on(value?: number) {
+		return this.sendCommand('DON', value);
+	}
+	async off() {
+		return this.sendCommand('DOF');
+	}
+	async fastOff() {
+		return this.sendCommand('DFOF');
+	}
+	async fastOn() {
+		return this.sendCommand('DFON');
+	}
+	async brighten() {
+		return this.sendCommand('BRT');
+	}
+	async dim() {
+		return this.sendCommand('DIM');
+	}
+	async fadeUp() {
+		return this.sendCommand('FDUP');
+	}
+	async fadeDown() {
+		return this.sendCommand('FDDOWN');
+	}
+	async fadeStop() {
+		return this.sendCommand('FDSTOP');
+	}
+	async query() {
+		return this.sendCommand('QUERY');
+	}
+	async beep(value?: number) {
+		return this.sendCommand('BEEP', { value: value });
+	}
+	async updateOnLevel(value: number) {
+		return this.sendCommand('OL', { value: value });
+	}
+	async updateRampRate(value: number) {
+		return this.sendCommand('RR', { value: value });
+	}
+	async backlight(value: number) {
+		return this.sendCommand('BL', { value: value });
+	}
+	async writeChanges() {
+		return this.sendCommand('WDU');
+	}
+	public get status(): number {
+		return this.drivers.ST?.value;
+	}
+	public get onLevel(): number {
+		return this.drivers.OL?.value;
+	}
+	public get rampRate(): number {
+		return this.drivers.RR?.value;
+	}
+	public get responding(): Insteon.Error {
+		return this.drivers.ERR?.value;
+	}
+}
+
+NodeFactory.register(DimmerLampSwitchNode);
+
+export namespace DimmerLampSwitch {
+	export interface Interface extends Omit<InstanceType<typeof DimmerLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
+		nodeDefId: 'DimmerLampSwitch';
+	}
+	export function is(node: ISYNode<any, any, any, any>): node is DimmerLampSwitchNode {
+		return node.nodeDefId === nodeDefId;
+	}
+	export function create(isy: ISY, nodeInfo: NodeInfo) {
+		return new DimmerLampSwitchNode(isy, nodeInfo);
+	}
+	export const Node = DimmerLampSwitchNode;
+	export type Commands = {
+		DON: ((value?: number) => Promise<boolean>) & {
+			label: 'On';
+			name: 'on';
+		};
+		DOF: (() => Promise<boolean>) & {
+			label: 'Off';
+			name: 'off';
+		};
+		DFOF: (() => Promise<boolean>) & {
+			label: 'Fast Off';
+			name: 'fastOff';
+		};
+		DFON: (() => Promise<boolean>) & {
+			label: 'Fast On';
+			name: 'fastOn';
+		};
+		BRT: (() => Promise<boolean>) & {
+			label: 'Brighten';
+			name: 'brighten';
+		};
+		DIM: (() => Promise<boolean>) & {
+			label: 'Dim';
+			name: 'dim';
+		};
+		FDUP: (() => Promise<boolean>) & {
+			label: 'Fade Up';
+			name: 'fadeUp';
+		};
+		FDDOWN: (() => Promise<boolean>) & {
+			label: 'Fade Down';
+			name: 'fadeDown';
+		};
+		FDSTOP: (() => Promise<boolean>) & {
+			label: 'Fade Stop';
+			name: 'fadeStop';
+		};
+		QUERY: (() => Promise<boolean>) & {
+			label: 'Query';
+			name: 'query';
+		};
+		BEEP: ((value?: number) => Promise<boolean>) & {
+			label: 'Beep';
+			name: 'beep';
+		};
+		OL: ((value: number) => Promise<boolean>) & {
+			label: 'On Level';
+			name: 'updateOnLevel';
+		};
+		RR: ((value: number) => Promise<boolean>) & {
+			label: 'Ramp Rate';
+			name: 'updateRampRate';
+		};
+		BL: ((value: number) => Promise<boolean>) & {
+			label: 'Backlight';
+			name: 'backlight';
+		};
+		WDU: (() => Promise<boolean>) & {
+			label: 'Write Changes';
+			name: 'writeChanges';
+		};
+	};
+	export type Drivers = {
+		ST: {
+			uom: UnitOfMeasure.LevelFrom0To255;
+			value: number;
+			label: 'Status';
+			name: 'status';
+		};
+		OL: {
+			uom: UnitOfMeasure.Percent;
+			value: number;
+			label: 'On Level';
+			name: 'onLevel';
+		};
+		RR: {
+			uom: UnitOfMeasure.Index;
+			value: number;
+			label: 'Ramp Rate';
+			name: 'rampRate';
+		};
+		ERR: {
+			uom: UnitOfMeasure.Index;
+			value: Insteon.Error;
+			label: 'Responding';
+			name: 'responding';
+		};
+	};
+}

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

@@ -1,5 +1,5 @@
-/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
-
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
@@ -11,12 +11,13 @@ import { Driver } from "../../../Definitions/Global/Drivers.js";
 import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
-
+import { validateHeaderName } from 'http';
+
 export const nodeDefId = "DimmerLampSwitch";
-
+
 type Commands = DimmerLampSwitch.Commands;
 type Drivers = DimmerLampSwitch.Drivers;
-
+
 export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements DimmerLampSwitch.Interface {
 	public readonly commands = {
 		DON: this.on,
@@ -102,9 +103,9 @@ export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements Dim
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(DimmerLampSwitchNode);
-
+
 export namespace DimmerLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof DimmerLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "DimmerLampSwitch";

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

@@ -1,5 +1,5 @@
-/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
-
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
@@ -11,12 +11,12 @@ import { Driver } from "../../../Definitions/Global/Drivers.js";
 import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
-
+
 export const nodeDefId = "RelayLampOnly";
-
+
 type Commands = RelayLamp.Commands;
 type Drivers = RelayLamp.Drivers;
-
+
 export class RelayLampNode extends Base<Drivers, Commands> implements RelayLamp.Interface {
 	public readonly commands = {
 		DON: this.on,
@@ -33,6 +33,7 @@ export class RelayLampNode extends Base<Drivers, Commands> implements RelayLamp.
 		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" });
+		
 	}
 	async on(value?: (0 | 100)) {
 		return this.sendCommand("DON", { value: value });
@@ -62,9 +63,9 @@ export class RelayLampNode extends Base<Drivers, Commands> implements RelayLamp.
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(RelayLampNode);
-
+
 export namespace RelayLamp {
 	export interface Interface extends Omit<InstanceType<typeof RelayLampNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "RelayLampOnly";

package/src/Devices/Insteon/InsteonBaseDevice.ts

@@ -1,5 +1,5 @@
 import 'winston';
-import { Converters } from '../../Converters.js';
+import { Converter } from '../../Converters.js';
 import type { Command } from '../../Definitions/Global/Commands.js';
 import { Driver, DriverType } from '../../Definitions/Global/Drivers.js';
 import { Family, Insteon } from '../../Definitions/Global/Families.js';
@@ -10,7 +10,7 @@ import { NodeInfo } from '../../Model/NodeInfo.js';
 import { byteToDegree, byteToPct, pctToByte, type StringKeys } from '../../Utils.js';
 import { ISYDeviceNode } from '../ISYDeviceNode.js';
 
-import type { Merge } from '@project-chip/matter.js/util';
+import type { Merge } from '@matter/general';
 import type { DriverState } from '../../Model/DriverState.js';
 
 // import { InsteonNLS } from './insteonfam.js'
@@ -20,7 +20,7 @@ export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = {}, C extend
 	C
 > {
 	// #region Constructors (1)
-
+	static vendorName: string = 'Insteon Technologies, Inc.';
 	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 		this.family = Family.Insteon;
@@ -38,7 +38,7 @@ export class InsteonBaseDevice<D extends ISYNode.DriverSignatures = {}, C extend
 			case UOM.DegreeX2:
 				return byteToDegree(value);
 			case UOM.LevelFrom0To255:
-				return Converters.Standard.LevelFrom0To255.Percent.to(value);
+				return Converter.Standard.LevelFrom0To255.Percent.to(value);
 			case UOM.Fahrenheit:
 				return value / 10;
 			default:

package/src/Devices/Insteon/InsteonDevice.ts

@@ -1,4 +1,4 @@
-import { Family, InsteonBaseDevice, ISY, ISYDevice } from '../../ISY.js';
+import { ISY } from '../../ISY.js';
 
 import { Insteon } from '../../Definitions/Global/Families.js';
 import { Commands } from '../../ISYConstants.js'
@@ -6,6 +6,7 @@ import { Constructor } from '../Constructor.js';
 import { InsteonKeypadButtonDevice } from './InsteonKeypadDevice.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
 import 'winston';
+import type { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 export const InsteonLampDevice = <T extends Constructor<InsteonBaseDevice>>(IB: T) => (class extends IB {
 			declare isDimmable: boolean;
@@ -21,7 +22,7 @@ export const InsteonLampDevice = <T extends Constructor<InsteonBaseDevice>>(IB:
 
 export const KeypadDevice = <T extends Constructor<InsteonBaseDevice>>(IB: T) => (class extends IB {
 
-	
+
 });
 
 

package/src/Devices/Insteon/InsteonDeviceFactory.ts

@@ -1,5 +1,5 @@
 import { Category } from '../../Definitions/Global/Categories.js';
-import { Family, InsteonBaseDevice, InsteonLockDevice, InsteonSmokeSensorDevice, InsteonThermostatDevice } from '../../ISY.js';
+
 import { parseTypeCode } from '../../Utils.js';
 import { NodeInfo } from '../../Model/NodeInfo.js';
 import { InsteonDimmableDevice } from './InsteonDimmableDevice.js';
@@ -19,6 +19,11 @@ import { ISYNode } from '../../ISYNode.js';
 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 { InsteonBaseDevice } from './InsteonBaseDevice.js';
+import { InsteonSmokeSensorDevice } from './InsteonSmokeSensorDevice.js';
+import { InsteonThermostatDevice } from './InsteonThermostatDevice.js';
+import { InsteonLockDevice } from './InsteonLockDevice.js';
 
 
 
@@ -327,7 +332,7 @@ export class InsteonDeviceFactory {
 				retVal = { name: 'Plugin Relay', modelNumber: '2633-522' };
 		}
 		if (subAddress != '1' && retVal.class === InsteonKeypadRelayDevice) {
-			retVal.class = InsteonKeypadButtonDevice;
+			retVal.class = InsteonKeypadButtonDevice as any;
 		}
 		if (retVal.class === undefined) { retVal.class = InsteonRelayDevice; }
 		return retVal;

package/src/Devices/Insteon/InsteonDimmableDevice.ts

@@ -1,7 +1,7 @@
 import { Identity } from '@project-chip/matter.js/util';
 import { ISY } from '../../ISY.js';
-import { MapsTo, type MapsToCluster } from '../MapsTo.js';
-import { EndpointFor } from '../EndpointFor.js';
+
+
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
 //
 import type { DimmableLightRequirements } from '@project-chip/matter.js/devices/DimmableLightDevice';
@@ -11,6 +11,7 @@ import { OnOff, ClusterType } from '@project-chip/matter.js/cluster';
 import 'winston';
 import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
 import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { DimmerLampSwitch } from './DimmerLampSwitch.js';
 
 // #region Type aliases (2)
 
@@ -22,7 +23,7 @@ type OnOffBehavior = typeof OOB;
 // #region Classes (1)
 
 //@ts-ignore
-export class InsteonDimmableDevice extends InsteonRelayDevice implements MapsTo<LevelControlBehavior, OnOffBehavior> {
+export class InsteonDimmableDevice extends DimmerLampSwitch.Node{
 	// #region Constructors (1)
 
 	constructor(isy: ISY, node: NodeInfo) {
@@ -37,7 +38,7 @@ export class InsteonDimmableDevice extends InsteonRelayDevice implements MapsTo<
 	// public async updateBrightnessLevel(level: number): Promise<{}> {
 	// 	return super.(level);
 	// }
-	public override async initialize(endpoint: EndpointFor<LevelControlBehavior, OnOffBehavior>): Promise<void> {
+	/*public override async initialize(endpoint: EndpointFor<LevelControlBehavior, OnOffBehavior>): Promise<void> {
 		try {
 			await super.initialize(endpoint);
 			const that = this;
@@ -51,7 +52,7 @@ export class InsteonDimmableDevice extends InsteonRelayDevice implements MapsTo<
 			// //endpoint.events.levelCont
 			// endpoint.events.levelControl.maxLevel$Changed.on((value) => that.sendCommand("OL",value));
 		} catch (error) {}
-	}
+	}*/
 
 	// #endregion Public Methods (1)
 }