isy-nodejs 1.0.1-alpha.26 → 1.0.1-alpha.28

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.1-alpha.26",
+    "version": "1.0.1-alpha.28",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "256b7ec74dbf1f1abcbfb7e0023f7c43ace45ad9"
+    "gitHead": "8db16499c0e5d154bfa3d13ccf0d31409abbb4ae"
 }

package/src/CodeGeneration/EnumFactory.ts

@@ -1,7 +1,7 @@
 import { factory } from "typescript";
 import { createWrappedNode, ts, type EnumDeclaration, EnumMember, Identifier } from 'ts-morph'
 import { UnitOfMeasure } from "../Definitions/Global/UOM.js";
-import { Family } from "../ISY.js";
+
 import type {
   NodeClassDefinition,
   DriverDefinition,
@@ -12,6 +12,7 @@ import { EnumDefinition, EnumDefinitionMap } from "../Model/EnumDefinition.js";
 import { isGeneratorFunction } from "util/types";
 import { Logger, loggers } from "winston";
 import { pascalCase } from 'moderndash';
+import { Family } from '../Definitions/index.js';
 
 
 const logger = loggers.get("EnumFactory");

package/src/CodeGeneration/NodeClassFactory.ts

@@ -2,9 +2,10 @@ import { createWrappedNode, IndentationText, Project, QuoteKind, SourceFile, ts,
 import { factory, Statement, type Declaration } from 'typescript';
 import type { Driver } from '../Definitions/Global/Drivers.js';
 import { UnitOfMeasure } from '../Definitions/Global/UOM.js';
-import { Family } from '../ISY.js';
+
 import { CommandDefinition, DataTypeDefinition, DriverDefinition, NodeClassDefinition, ParameterDefinition } from '../Model/ClassDefinition.js';
 import { EnumDefinitionMap } from '../Model/EnumDefinition.js';
+import  { Family } from '../Definitions/index.js';
 
 // #region Type aliases (1)
 

package/src/Converters.ts

@@ -1,4 +1,3 @@
-
 import { UnitOfMeasure } from './Definitions/Global/UOM.js';
 import { type StringKeys } from './Utils.js';
 
@@ -9,26 +8,21 @@ let NullConverter: Converter<any, any>;
 	from: (value: any) => value;
 }
 
-BooleanPercentage = {
-	to: (value: number): boolean => {
-		return value > 0;
-	},
-	from: (value: boolean): number => {
-		return value ? 100 : 0;
-	}
-};
-
-const StandardConverters: {
-	[x in `${keyof typeof UnitOfMeasure}`]?: { [y in `${keyof typeof UnitOfMeasure}`]?: Converter<any, any> };
-} = {
+const StandardConverters = {
 	Boolean: {
 		LevelFrom0To255: {
 			to: (value: boolean) => (value ? 255 : 0),
 			from: (value: number) => value > 0
 		},
-		Percent: BooleanPercentage
+		Percent: {
+			to: (value: number): boolean => {
+				return value > 0;
+			},
+			from: (value: boolean): number => {
+				return value ? 100 : 0;
+			}
+		}
 	},
-	Percent: {},
 	LevelFrom0To255: {
 		Percent: {
 			to: (value: number): number => {
@@ -41,8 +35,8 @@ const StandardConverters: {
 	}
 };
 
-StandardConverters.Percent.LevelFrom0To255 = invert(StandardConverters.LevelFrom0To255.Percent);
-StandardConverters.LevelFrom0To255.Boolean = invert(StandardConverters.Boolean.LevelFrom0To255);
+//StandardConverters.Percent.LevelFrom0To255 = invert(StandardConverters.LevelFrom0To255.Percent);
+//StandardConverters.LevelFrom0To255.Boolean = invert(StandardConverters.Boolean.LevelFrom0To255);
 
 export const StdConverterRegistry = new Map<UnitOfMeasure | string, Map<UnitOfMeasure | string, Converter<any, any>>>();
 
@@ -94,6 +88,7 @@ export namespace Converter {
 					: value === 255 ? 254
 					: value
 			}
+
 		}
 	};
 
@@ -108,7 +103,7 @@ export namespace Converter {
 	export type MatterConverters = `${MatterISYConvertibleTypes}.${ISYMatterConvertibleTypes}` | `${ISYMatterConvertibleTypes}.${MatterISYConvertibleTypes}`;
 
 	export type KnownConverters = StandardConverters | MatterConverters;
-	const cache : {[x:string]:Converter<any,any>} = {};
+	const cache: { [x: string]: Converter<any, any> } = {};
 	export function get(label: KnownConverters): Converter<any, any>;
 	export function get(from: UnitOfMeasure, to: UnitOfMeasure);
 	export function get(from: ConverterTypes, to: ConverterTypes);
@@ -116,23 +111,22 @@ export namespace Converter {
 	export function get(from: MatterISYConvertibleTypes, to: ISYMatterConvertibleTypes);
 	export function get(to: ISYMatterConvertibleTypes, from: MatterISYConvertibleTypes);
 	export function get(from: UnitOfMeasure | `${keyof typeof UnitOfMeasure}` | string, to?: UnitOfMeasure | `${keyof typeof UnitOfMeasure}` | string): Converter<any, any> {
-		if(to === undefined) {
+		if (to === undefined) {
 			return ConverterRegistry.get(from as string) ?? NullConverter;
 		}
-		if(cache[`${from}.${to}`]) {
+		if (cache[`${from}.${to}`]) {
 			return cache[`${from}.${to}`];
-		}
-		else if(cache[`${to}.${from}`]) {
+		} else if (cache[`${to}.${from}`]) {
 			cache[`${from}.${to}`] = invert(cache[`${to}.${from}`]);
 			return cache[`${from}.${to}`];
 		}
 		let isString = typeof from === 'string';
 		let fuom = isString ? from : UnitOfMeasure[from];
 		if (to) {
-			let tuom = typeof to === 'string' ? to : UnitOfMeasure[to]; ;
+			let tuom = typeof to === 'string' ? to : UnitOfMeasure[to];
 
 			if (StdConverterRegistry.has(fuom)) {
-				if(StdConverterRegistry.get(fuom).has(tuom)) {
+				if (StdConverterRegistry.get(fuom).has(tuom)) {
 					return StdConverterRegistry.get(fuom).get(tuom);
 				}
 			}

package/src/Definitions/Global/Commands.ts

@@ -1,10 +1,22 @@
 import { TimeFormatLocalization } from '@project-chip/matter.js/cluster';
 import type { Identity, Merge, UnionToIntersection } from '@project-chip/matter.js/util';
 import type { Sign } from 'crypto';
+import type { UnitOfMeasure } from './UOM.js';
+
+/*export class Command<T extends string> extends Function {
+
+	constructor(public readonly label: string) {
+		super();
+	}
+
+	public async execute(...args: any[]): Promise<Boolean> {
+		return this(...args);
+	}
+}*/
 
 export namespace Command {
 
-    export type Signature<F extends {name: string} = CallableFunction, L extends string = string,N extends string = string> = F & {label: L, name: N };
+    export type Signature<F extends {name} = CallableFunction, L extends string = string,N extends string = string> = F & {label: L, name: N,} ;
 
     export type Signatures<C extends string> = {[K in C]: Signature<(...args: any[]) => Promise<Boolean>, string, string>};
 

package/src/Definitions/Global/Events.ts

@@ -3,7 +3,7 @@ import type { AnyMxRecord } from 'dns';
 import EventEmitter, { on } from 'events';
 import type { EventType } from '../../Events/EventType.js';
 import { ISYEvent } from '../../Events/ISYEvent.js';
-import type { InsteonBaseDevice, ISY } from '../../ISY.js';
+import type { ISY } from '../../ISY.js';
 import type { ISYNode } from '../../ISYNode.js';
 import type { UnitOfMeasure } from './UOM.js';
 
@@ -63,7 +63,7 @@ export namespace Event {
 	): FunctionSigFor<E, NodeEventEmitter<N>> & Omit<NodeEventEmitter<N>, 'on'> {
 		var f = new NodeEventEmitter(node);
 		for (let evt in node.drivers) {
-			
+
 			//f[`on${ev.name}`] = f.on.bind(f, ev.name);
 		}
 

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,6 +10,7 @@ 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 class ISYDeviceNode<

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

@@ -39,13 +39,13 @@ export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements Dim
 	declare readonly nodeDefId: 'DimmerLampSwitch';
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		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: value });
+		return this.sendCommand('DON', value);
 	}
 	async off() {
 		return this.sendCommand('DOF');
@@ -180,7 +180,7 @@ export namespace DimmerLampSwitch {
 	};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
+			uom: UnitOfMeasure.LevelFrom0To255;
 			value: number;
 			label: 'Status';
 			name: 'status';

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/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/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,4 +1,4 @@
-import { Family, ISY } from '../../ISY.js';
+import {  ISY } from '../../ISY.js';
 
 import { NodeInfo } from '../../Model/NodeInfo.js';
 import { EndpointFor } from '../EndpointFor.js';

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,18 @@
 /* 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 { 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 +32,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.state['ST'], { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		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('DON', value);
 	}
 	async off() {
 		return this.sendCommand('DOF');
@@ -59,7 +59,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 +71,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 +81,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/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/ZWaveDimmerSwitchDevice.ts

@@ -1,6 +1,6 @@
 
 
-import { Family } from '../../ISY.js';
+
 import { ZWaveBaseDevice } from './ZWaveBaseDevice.js';
 import 'winston';
 

package/src/Devices/index.ts

@@ -1,6 +1,6 @@
-import { Family } from "../ISY.js";
+
+import type { Family } from '../Definitions/index.js';
 import {Insteon} from "./Insteon/index.js";
-import { ISYDeviceNode } from './ISYDeviceNode.js';
 import { ZWaveBaseDevice } from "./ZWave/ZWaveBaseDevice.js";
 
 export const Devices = {