isy-nodejs 1.0.1-alpha.9 → 1.0.2-alpha.1

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/InsteonBaseDevice.ts

@@ -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;

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)
 }

package/src/Devices/Insteon/InsteonFanDevice.ts

@@ -1,5 +1,5 @@
 import { Family } from '../../Definitions/Global/Families.js';
-import { ISY, ISYNode } from '../../ISY.js';
+import { ISY } from '../../ISY.js';
 import { States } from '../../ISYConstants.js';
 
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';

package/src/Devices/Insteon/InsteonKeypadDevice.ts

@@ -1,11 +1,11 @@
-import type { NodeInfo } from '../../Model/NodeInfo.js';
+import 'winston';
 import { ISY } from '../../ISY.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
 import { InsteonRelayDevice } from './InsteonRelayDevice.js';
-import 'winston';
-
+import { KeypadButton } from './KeypadButton.js';
 
-export class InsteonKeypadButtonDevice extends InsteonRelayDevice {
-	constructor (isy: ISY, deviceNode: NodeInfo) {
+export class InsteonKeypadButtonDevice extends KeypadButton.Node {
+	constructor(isy: ISY, deviceNode: NodeInfo) {
 		super(isy, deviceNode);
 	}
 }

package/src/Devices/Insteon/InsteonRelayDevice.ts

@@ -1,8 +1,8 @@
-import { Family, ISY } from '../../ISY.js';
+import {  ISY } from '../../ISY.js';
 
 import { NodeInfo } from '../../Model/NodeInfo.js';
-import { EndpointFor } from '../EndpointFor.js';
-import { MapsTo } from '../MapsTo.js';
+
+
 import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
 import type { OnOffBehavior } from '@project-chip/matter.js/behaviors/on-off';
@@ -26,22 +26,7 @@ export class InsteonRelayDevice extends RelayLampSwitch.Node /*InsteonBaseDevice
 
 	// #region Public Methods (2)
 
-	public async initialize(endpoint: EndpointFor<typeof OnOffBehavior>): Promise<void> {
-		/*endpoint.events.onOff.onOff$Changed.on((value) => {
-			this.commands.DON(value);
-			this.drivers.ST;
-		});
-		//endpoint.defaults.onOff.onOff = await this.isOn;
-		endpoint.set({ onOff: { onOff: (await this.drivers.ST.value) > 0 } });
-		const that = this;
-
-		this.events.on('StatusChanged', (propertyName, newValue, _oldValue, formattedValue) => {
-			if (propertyName === 'ST') {
-				endpoint.set({ onOff: { onOff: newValue > 0 } });
-				//endpoint.setSt onOff: newValue });
-			}
-		});*/
-	}
+
 
 	/*
 	public async updateIsOn(isOn: boolean): Promise<any> {

package/src/Devices/Insteon/{Generated/KeypadButton.ts → KeypadButton.ts}

@@ -1,29 +1,29 @@
-/* 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";
-import type { ISY } from "../../../ISY.js";
-import type { ISYNode } from "../../../ISYNode.js";
-import { Base } from "../index.js";
-import { ISYDeviceNode } from "../../ISYDeviceNode.js";
-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";
-
+/* 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";
+import type { ISY } from "../../ISY.js";
+import type { ISYNode } from "../../ISYNode.js";
+import { Base } from "./index.js";
+import { ISYDeviceNode } from "../ISYDeviceNode.js";
+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 = "KeypadButton";
-
+
 type Commands = KeypadButton.Commands;
 type Drivers = KeypadButton.Drivers;
-
+
 export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadButton.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		QUERY: this.query,
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "KeypadButton";
+	static override nodeDefId = "KeypadButton";
 	declare readonly nodeDefId: "KeypadButton";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -46,9 +46,9 @@ export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadB
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(KeypadButtonNode);
-
+
 export namespace KeypadButton {
 	export interface Interface extends Omit<InstanceType<typeof KeypadButtonNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "KeypadButton";

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -1,18 +1,19 @@
 /* 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";
-import type { ISY } from "../../ISY.js";
-import type { ISYNode } from "../../ISYNode.js";
-import { InsteonBaseDevice } from "./InsteonBaseDevice.js";
-import { ISYDeviceNode } from "../ISYDeviceNode.js";
-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 { Driver } from '../../Definitions/Global/Drivers.js';
+import { Command } from '../../Definitions/index.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 } from './InsteonBaseDevice.js';
 
-export const nodeDefId = "RelayLampSwitch";
+export const nodeDefId = 'RelayLampSwitch';
 
 type Commands = RelayLampSwitch.Commands;
 type Drivers = RelayLampSwitch.Drivers;
@@ -32,11 +33,11 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	declare readonly nodeDefId: 'RelayLampSwitch';
 	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.Boolean, label: 'Status', name: 'status' });
+		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 	}
 	async on(value?: 0 | 100) {
-		return this.sendCommand('DON', { value: value });
+		return this.sendCommand('DOF');
 	}
 	async off() {
 		return this.sendCommand('DOF');
@@ -59,7 +60,7 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	async writeChanges() {
 		return this.sendCommand('WDU');
 	}
-	public get status(): Insteon.OnLevelRelay {
+	public get status(): boolean {
 		return this.drivers.ST?.value;
 	}
 	public get responding(): Insteon.Error {
@@ -71,7 +72,7 @@ NodeFactory.register(RelayLampSwitchNode);
 
 export namespace RelayLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof RelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "RelayLampSwitch";
+		nodeDefId: 'RelayLampSwitch';
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is RelayLampSwitchNode {
 		return node.nodeDefId === nodeDefId;
@@ -81,51 +82,51 @@ export namespace RelayLampSwitch {
 	}
 	export const Node = RelayLampSwitchNode;
 	export type Commands = {
-		DON: ((value?: (0 | 100)) => Promise<boolean>) & {
-			label: "On";
-			name: "on";
+		DON: ((value?: 0 | 100) => Promise<boolean>) & {
+			label: 'On';
+			name: 'on';
 		};
 		DOF: (() => Promise<boolean>) & {
-			label: "Off";
-			name: "off";
+			label: 'Off';
+			name: 'off';
 		};
 		DFOF: (() => Promise<boolean>) & {
-			label: "Fast Off";
-			name: "fastOff";
+			label: 'Fast Off';
+			name: 'fastOff';
 		};
 		DFON: (() => Promise<boolean>) & {
-			label: "Fast On";
-			name: "fastOn";
+			label: 'Fast On';
+			name: 'fastOn';
 		};
 		QUERY: (() => Promise<boolean>) & {
-			label: "Query";
-			name: "query";
+			label: 'Query';
+			name: 'query';
 		};
 		BEEP: ((value?: number) => Promise<boolean>) & {
-			label: "Beep";
-			name: "beep";
+			label: 'Beep';
+			name: 'beep';
 		};
 		BL: ((value: number) => Promise<boolean>) & {
-			label: "Backlight";
-			name: "backlight";
+			label: 'Backlight';
+			name: 'backlight';
 		};
 		WDU: (() => Promise<boolean>) & {
-			label: "Write Changes";
-			name: "writeChanges";
+			label: 'Write Changes';
+			name: 'writeChanges';
 		};
 	};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
-			value: Insteon.OnLevelRelay;
-			label: "Status";
-			name: "status";
+			uom: UnitOfMeasure.Boolean;
+			value: boolean;
+			label: 'Status';
+			name: 'status';
 		};
 		ERR: {
 			uom: UnitOfMeasure.Index;
 			value: Insteon.Error;
-			label: "Responding";
-			name: "responding";
+			label: 'Responding';
+			name: 'responding';
 		};
 	};
 }

package/src/Devices/MapsTo.ts

@@ -1,5 +1,5 @@
 import { Behavior } from '@project-chip/matter.js/behavior';
-import { EndpointFor, type EndpointForCluster } from './EndpointFor.js';
+
 import type { Cluster, ClusterType, MutableCluster } from '@project-chip/matter.js/cluster';
 
 
@@ -15,7 +15,7 @@ export type RelaxTypes<V> = V extends number
                   }
             : V;
 
-
+/*
 
 export interface MapsTo<T extends Behavior.Type, T1 extends Behavior.Type = T, T2 extends Behavior.Type = T, T3 extends Behavior.Type = T> {
 	 initialize(endpoint: EndpointFor<T, T1, T2, T3>): void | Promise<void>;
@@ -25,4 +25,4 @@ export interface MapsTo<T extends Behavior.Type, T1 extends Behavior.Type = T, T
 export interface MapsToCluster<T extends ClusterType.Of<ClusterType.Options<{}>>, T1 extends ClusterType = T, T2 extends ClusterType = T, T3 extends ClusterType = T> {
 	initialize(endpoint: EndpointForCluster<T,T1, T2, T3>): void;
 
-}
+}*/

package/src/Devices/NodeFactory.ts

@@ -1,10 +1,11 @@
-import type { MaybePromise } from '@project-chip/matter.js/util';
-import { Family, ISY } from '../ISY.js';
+
+import { ISY } from '../ISY.js';
 import  { ISYNode } from '../ISYNode.js';
 import type { NodeDef } from '../Model/NodeDef.js';
 import { isDynamic, type NodeInfo } from '../Model/NodeInfo.js';
 import type { Constructor } from './Constructor.js';
 import type { IdentityOf } from '../Utils.js';
+import { Family } from '../Definitions/index.js';
 
 
 

package/src/Devices/ZWave/ZWaveBaseDevice.ts

@@ -6,7 +6,7 @@ import { ISYDeviceNode } from '../ISYDeviceNode.js';
 import { ISYNode } from '../../ISYNode.js';
 import 'winston';
 import type { Driver } from '../../Definitions/Global/Drivers.js';
-import type { Merge } from '@project-chip/matter.js/util';
+import type { Merge } from '@matter/general';
 
 // import { InsteonNLS } from './insteonfam'
 export class ZWaveBaseDevice<D extends ISYNode.DriverSignatures = {}, C extends ISYNode.CommandSignatures = {}> extends ISYDeviceNode<Family.ZWave,Merge<D,Driver.Signatures<'ST'>>,C> {