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

package/src/Devices/ZWave/Generated/DimmerSwitch.ts

@@ -41,18 +41,18 @@ export class DimmerSwitchNode extends Base<Drivers, Commands> implements DimmerS
 		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?: ZWave.PercentOpt | number, rampRate?: number | number) { return this.sendCommand("DON", value, { RR: rampRate }); }
+	async on(value?: number | ZWave.PercentOpt, rampRate?: number) { return this.sendCommand("DON", value, { RR: rampRate }); }
 	async off() { return this.sendCommand("DOF"); }
 	async fastOn() { return this.sendCommand("DFON"); }
 	async fastOff() { return this.sendCommand("DFOF"); }
 	async brighten() { return this.sendCommand("BRT"); }
 	async dim() { return this.sendCommand("DIM"); }
-	async fadeUp(startLevel?: ZWave.PercentOpt | number, rampRate?: number | number) { return this.sendCommand("FDUP", { STARTLEVEL: startLevel, RR: rampRate }); }
-	async fadeDown(startLevel?: ZWave.PercentOpt | number, rampRate?: number | number) { return this.sendCommand("FDDOWN", { STARTLEVEL: startLevel, RR: rampRate }); }
-	async fade(direction: ZWave.FadeDirection, startLevel?: ZWave.PercentOpt | number, rampRate?: number | number, direction2?: ZWave.FadeDirection, fadeRate2?: number | number) { return this.sendCommand("FADE", { DIR: direction, STARTLEVEL: startLevel, RR: rampRate, DIR2: direction2, STEP2: fadeRate2 }); }
+	async fadeUp(startLevel?: number | ZWave.PercentOpt, rampRate?: number) { return this.sendCommand("FDUP", { STARTLEVEL: startLevel, RR: rampRate }); }
+	async fadeDown(startLevel?: number | ZWave.PercentOpt, rampRate?: number) { return this.sendCommand("FDDOWN", { STARTLEVEL: startLevel, RR: rampRate }); }
+	async fade(direction: ZWave.FadeDirection, startLevel?: number | ZWave.PercentOpt, rampRate?: number, direction2?: ZWave.FadeDirection, fadeRate2?: number) { return this.sendCommand("FADE", { DIR: direction, STARTLEVEL: startLevel, RR: rampRate, DIR2: direction2, STEP2: fadeRate2 }); }
 	async fadeStop() { return this.sendCommand("FDSTOP"); }
 	async query() { return this.sendCommand("QUERY"); }
-	async setConfiguration(parameterNumber: number, parameterValue: number | number | number | number | number | number) { return this.sendCommand("CONFIG", { NUM: parameterNumber, VAL: parameterValue }); }
+	async setConfiguration(parameterNumber: number, parameterValue: number) { return this.sendCommand("CONFIG", { NUM: parameterNumber, VAL: parameterValue }); }
 	async writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): number {
 		return this.drivers.ST?.value;
@@ -68,7 +68,9 @@ export namespace DimmerSwitch {
 	export interface Interface extends Omit<InstanceType<typeof DimmerSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "119";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is DimmerSwitchNode { return ["119"].includes(node.nodeDefId); }
+	export function is(node: ISYNode<any, any, any, any>): node is DimmerSwitchNode {
+		return ["119"].includes(node.nodeDefId);
+	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is DimmerSwitchNode {
 		return ["119"].includes(node.nodeDefId);
 	}
@@ -77,7 +79,7 @@ export namespace DimmerSwitch {
 	}
 	export const Node = DimmerSwitchNode;
 	export type Commands = {
-		DON: ((value?: ZWave.PercentOpt | number, RR?: number | number) => Promise<boolean>) & {
+		DON: ((value?: number | ZWave.PercentOpt, RR?: number) => Promise<boolean>) & {
 			label: "On";
 			name: "on";
 		};
@@ -101,15 +103,15 @@ export namespace DimmerSwitch {
 			label: "Dim";
 			name: "dim";
 		};
-		FDUP: ((STARTLEVEL?: ZWave.PercentOpt | number, RR?: number | number) => Promise<boolean>) & {
+		FDUP: ((STARTLEVEL?: number | ZWave.PercentOpt, RR?: number) => Promise<boolean>) & {
 			label: "Fade Up";
 			name: "fadeUp";
 		};
-		FDDOWN: ((STARTLEVEL?: ZWave.PercentOpt | number, RR?: number | number) => Promise<boolean>) & {
+		FDDOWN: ((STARTLEVEL?: number | ZWave.PercentOpt, RR?: number) => Promise<boolean>) & {
 			label: "Fade Down";
 			name: "fadeDown";
 		};
-		FADE: ((DIR: ZWave.FadeDirection, STARTLEVEL?: ZWave.PercentOpt | number, RR?: number | number, DIR2?: ZWave.FadeDirection, STEP2?: number | number) => Promise<boolean>) & {
+		FADE: ((DIR: ZWave.FadeDirection, STARTLEVEL?: number | ZWave.PercentOpt, RR?: number, DIR2?: ZWave.FadeDirection, STEP2?: number) => Promise<boolean>) & {
 			label: "Fade";
 			name: "fade";
 		};
@@ -121,7 +123,7 @@ export namespace DimmerSwitch {
 			label: "Query";
 			name: "query";
 		};
-		CONFIG: ((NUM: number, VAL: number | number | number | number | number | number) => Promise<boolean>) & {
+		CONFIG: ((NUM: number, VAL: number) => Promise<boolean>) & {
 			label: "Set Configuration";
 			name: "setConfiguration";
 		};

package/src/Devices/ZigBeeLegacy/Generated/Relay.ts

@@ -53,7 +53,9 @@ export namespace Relay {
 	export interface Interface extends Omit<InstanceType<typeof RelayNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "RelayLoadControl";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is RelayNode { return ["RelayLoadControl"].includes(node.nodeDefId); }
+	export function is(node: ISYNode<any, any, any, any>): node is RelayNode {
+		return ["RelayLoadControl"].includes(node.nodeDefId);
+	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is RelayNode {
 		return ["RelayLoadControl"].includes(node.nodeDefId);
 	}

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

@@ -105,7 +105,9 @@ 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); }
+	export function is(node: ISYNode<any, any, any, any>): node is ThermostatNode {
+		return ["Thermostat"].includes(node.nodeDefId);
+	}
 	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is ThermostatNode {
 		return ["Thermostat"].includes(node.nodeDefId);
 	}

package/src/ISY.ts

@@ -1,9 +1,9 @@
-import WebSocket from 'faye-websocket';
+
 import { writeFile } from 'fs';
 
 import { Parser, type ParserOptions } from 'xml2js';
 import { parseBooleans, parseNumbers } from 'xml2js/lib/processors.js';
-
+import WebSocket from 'ws';
 import axios, { type AxiosRequestConfig } from 'axios';
 import { EventEmitter } from 'events';
 import { format, Logger, loggers, type LeveledLogMethod } from 'winston';
@@ -27,6 +27,9 @@ import { NodeFactory } from './Devices/NodeFactory.js';
 import { ISYError } from './ISYError.js';
 import type { Config } from './Model/Config.js';
 import { findPackageJson } from './Utils.js';
+import { textChangeRangeIsUnchanged } from 'typescript';
+import type { ClientRequestArgs } from 'http';
+import { promisify } from 'util';
 
 
 
@@ -94,9 +97,9 @@ interface ISYConfig {
 	port: number;
 	protocol: 'http' | 'https';
 	username: string;
-
 	socketPath?: string;
-
+	axiosOptions?: AxiosRequestConfig;
+	webSocketOptions?: WebSocket.ClientOptions & ClientRequestArgs;
 	// #endregion Properties (8)
 }
 
@@ -135,7 +138,7 @@ export class ISY extends EventEmitter implements Disposable {
 	public productName = 'eisy';
 	public firmwareVersion: any;
 	public vendorName = 'Universal Devices, Inc.';
-	public webSocket: WebSocket.Client;
+	public webSocket: WebSocket;
 
 	public apiVersion: string;
 
@@ -162,7 +165,7 @@ export class ISY extends EventEmitter implements Disposable {
 		};
 		this.protocol = config.protocol;
 		this.wsprotocol = config.protocol === 'https' ? 'wss' : 'ws';
-
+		this.socketPath = config.socketPath;
 		this.axiosOptions = {
 			baseURL: `${this.protocol}://${this.host}:${this.port}`,
 			validateStatus: (status) => status >= 200 && status < 300
@@ -174,6 +177,15 @@ export class ISY extends EventEmitter implements Disposable {
 			this.axiosOptions.auth = { username: this.credentials.username, password: this.credentials.password };
 		}
 
+		this.webSocketOptions = { origin: 'com.universal-devices.websockets.isy' };
+
+		if (this.socketPath) {
+			this.webSocketOptions.socketPath = this.socketPath;
+		} else {
+			this.webSocketOptions.auth = `${this.credentials.username}:${this.credentials.password}`;
+		}
+
+
 		//this.elkEnabled = config.elkEnabled ?? false;
 
 		this.nodesLoaded = false;
@@ -355,29 +367,40 @@ export class ISY extends EventEmitter implements Disposable {
 		try {
 			await this.loadConfig();
 			await this.loadNodes();
+			await this.refreshStatuses();
 			await this.loadVariables(VariableType.Integer);
 			await this.loadVariables(VariableType.State);
-			await this.refreshStatuses();
 			await this.#finishInitialize(true);
 			return true;
 		} catch (e) {
 			if (e instanceof ISYInitializationError) {
+				if(e.step === 'variables')
+				{
+					this.logger.warn(`Error loading variables: ${e.message}`);
+				    await this.#finishInitialize(true);
+					return true;
+				}
 				this.logger.error(`Error initializing ISY during (${e.step}): ${e.message}`);
+				return false;
 			} else {
 				this.logger.error(`Error initializing ISY: ${e.message}`);
+				return false;
 			}
 			throw e;
 		} finally {
 			if (this.nodesLoaded !== true) {
-				that.#finishInitialize(false);
+				await that.#finishInitialize(false);
 			}
 		}
 	}
 
+	webSocketOptions: WebSocket.ClientOptions & ClientRequestArgs;
+
 	public async initializeWebSocket() {
 		try {
 			const that = this;
-			const auth = `Basic ${Buffer.from(`${this.credentials.username}:${this.credentials.password}`).toString('base64')}`;
+
+			//const auth = `Basic ${Buffer.from(`${this.credentials.username}:${this.credentials.password}`).toString('base64')}`;
 			this.logger.info(`Opening webSocket: ${this.wsprotocol}://${this.address}/rest/subscribe`);
 			if (this.webSocket) {
 				try {
@@ -386,27 +409,33 @@ export class ISY extends EventEmitter implements Disposable {
 					this.logger.warn(`Error closing existing websocket: ${e.message}`);
 				}
 			}
-			this.webSocket = new WebSocket.Client(`${this.wsprotocol}://${this.address}/rest/subscribe`, ['ISYSUB'], {
-				headers: {
+
+				/*headers: {
 					Origin: 'com.universal-devices.websockets.isy',
-					Authorization: auth
+					auth
 				},
-				ping: 10
-			});
 
-			this.lastActivity = new Date();
+				ping: 10*/
+			let p  = new Promise<void>((resolve, reject) => {
 
-			this.webSocket
-				.on('message', (event: any) => {
-					that.logger.silly(`Received message: ${Utils.logStringify(event.data, 1)}`);
-					that.handleWebSocketMessage(event);
+			this.webSocket = new WebSocket(`${this.wsprotocol}://${this.address}/rest/subscribe`, ['ISYSUB'], this.webSocketOptions);
+			this.lastActivity = new Date();
+			//this.webSocket.onmessage = (event) => {this.handleWebSocketMessage()
+			this.webSocket.on('open',() => {
+				this.logger.info('Websocket connection open');
+				resolve();
+			})
+				.on('message',(data,b)=> {
+					that.logger.silly(`Received message: ${Utils.logStringify(data, 1)}`);
+					that.handleWebSocketMessage({data: data});
 				})
 				.on('error', (err: any, response: any) => {
-					that.logger.warn(`Websocket subscription error: ${Utils.logStringify(err, 1)}`);
+					that.logger.warn(`Websocket subscription error: ${err}`);
+					return reject(new ISYInitializationError('Websocket subscription error', 'websocket'));
 				})
 				.on('fail', (data: string, response: any) => {
 					that.logger.warn(`Websocket subscription failure: ${data}`);
-					throw new Error('Websocket subscription failure');
+					return reject(new Error('Websocket subscription failure'));
 				})
 				.on('abort', () => {
 					that.logger.warn('Websocket subscription aborted.');
@@ -414,8 +443,11 @@ export class ISY extends EventEmitter implements Disposable {
 				})
 				.on('timeout', (ms: string) => {
 					that.logger.warn(`Websocket subscription timed out after ${ms} milliseconds.`);
-					throw new Error('Timeout contacting ISY');
+					return reject(new Error('Timeout contacting ISY'));
+					//throw new Error('Timeout contacting ISY');
 				});
+			});
+			return p;
 		} catch (e) {
 			throw new ISYInitializationError(e, 'websocket');
 		}
@@ -646,7 +678,7 @@ export class ISY extends EventEmitter implements Disposable {
 		}
 	}
 
-	#finishInitialize(success: boolean) {
+	async #finishInitialize(success: boolean) {
 		if (!this.nodesLoaded) {
 			this.nodesLoaded = true;
 			//initializeCompleted();
@@ -656,10 +688,11 @@ export class ISY extends EventEmitter implements Disposable {
 				// }
 				if (this.enableWebSocket) {
 					this.guardianTimer = setInterval(this.#guardian.bind(this), 60000);
-					this.initializeWebSocket();
+					return this.initializeWebSocket();
 				}
 			}
 		}
+
 	}
 
 	async #guardian() {

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -11,10 +11,10 @@ import internal from 'stream';
 import type { Driver } from '../../Definitions/Global/Drivers.js';
 import { ISY } from '../../ISY.js';
 import type { ISYDevice } from '../../ISYDevice.js';
-import { DeviceToClusterMap, MappingRegistry, type ClusterMapping, type BehaviorMapping } from '../../Model/ClusterMap.js';
 import { server } from 'typescript';
 import type { ISYNode } from '../../ISYNode.js';
 import type { Family } from '../../Definitions/index.js';
+import { MappingRegistry, type BehaviorMapping, type DeviceToClusterMap } from '../Mappings/MappingRegistry.js';
 
 
 

package/src/Matter/Behaviors/ISYClusterBehavior.ts

@@ -4,8 +4,9 @@ import '@project-chip/matter.js/device';
 import { Converter } from '../../Converters.js';
 import type { Constructor } from '../../Devices/Constructor.js';
 import type { DriversOf, ISYNode } from '../../ISYNode.js';
-import { BehaviorMapping } from '../../Model/ClusterMap.js';
+
 import { ISYBridgedDeviceBehavior } from './ISYBridgedDeviceBehavior.js';
+import type { BehaviorMapping } from '../Mappings/MappingRegistry.js';
 
 // #region Type aliases (6)
 

package/src/Matter/Behaviors/Insteon/ISYOnOffBehavior.ts

@@ -8,7 +8,7 @@ import type { MaybePromise } from '@project-chip/matter.js/util';
 import { DriverType } from '../../../Definitions/Global/Drivers.js';
 import { InsteonDimmableDevice } from '../../../Devices/Insteon/InsteonDimmableDevice.js';
 import { InsteonRelayDevice } from '../../../Devices/Insteon/InsteonRelayDevice.js';
-import { MappingRegistry } from '../../../Model/ClusterMap.js';
+
 import { ClusterForBehavior, ISYClusterBehavior, type PropertyChange } from '../ISYClusterBehavior.js';
 
 import { Converter } from '../../../Converters.js';
@@ -53,6 +53,7 @@ export class ISYDimmableBehavior extends ISYClusterBehavior(DimmableLightRequire
 
 	override setLevel(level: number): MaybePromise<void> {
 		level = Converter.Matter.LevelFrom0To255.LightingLevel.from(level);
+		
 		if (level > 0) {
 			return this.device.on(level);
 		} else {

package/src/Matter/Bridge/Server.ts

@@ -17,14 +17,16 @@ import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.
 import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
 import '../Mappings/Insteon.js';
 import type { ISYNode } from '../../ISYNode.js';
-import { MappingRegistry, type DeviceToClusterMap } from '../../Model/ClusterMap.js';
+
 import { Options } from '../../Definitions/ZWave/index.js';
 import { InsteonBaseDevice } from '../../Devices/Insteon/InsteonBaseDevice.js';
 import { DimmerLamp } from '../../Devices/Insteon/Generated/DimmerLamp.js';
 import { Family } from '../../Definitions/index.js';
 import { RelayLamp } from '../../Devices/Insteon/index.js';
 import type { DeviceTypeDefinition } from '@project-chip/matter.js/device';
+import { MappingRegistry } from '../Mappings/MappingRegistry.js';
 import type { BridgedISYNodeInformationServer } from '../../Devices/EndpointFor.js';
+import { BasicInformation } from '@project-chip/matter.js/cluster';
 
 
 // #region Interfaces (1)
@@ -226,7 +228,7 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 		if (deviceOptions?.exclude) {
 			continue;
 		}
-		let serialNumber = `${device.address.replaceAll(' ', '_').replaceAll('.', '_')}`;
+		let uniqueId = `${device.address.replaceAll(' ', '_').replaceAll('.', '_')}`;
 		if (device.enabled) {
 			//const name = `OnOff ${isASocket ? "Socket" : "Light"} ${i}`;
 
@@ -257,7 +259,7 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 				logger.info(`Device ${device.label} (${device.address}) with NodeDefId = ${device.nodeDefId} mapped to ${deviceType.name}`);
 				//@ts-ignore
 				const endpoint = new Endpoint(baseBehavior, {
-					id: serialNumber,
+					id: uniqueId,
 					isyNode: {
 						address: device.address
 					},
@@ -274,10 +276,12 @@ export async function createMatterServer(isy?: ISY, config?: Config): Promise<Se
 						softwareVersion: Number(device.version),
 						softwareVersionString: `v.${device.version}`,
 
-						serialNumber: serialNumber,
+						serialNumber: device.address,
 						reachable: true,
-						uniqueId: device.address
-					}
+						uniqueId: uniqueId
+
+					},
+
 				});
 
 				await aggregator.add(endpoint);

package/src/Matter/Mappings/Insteon.ts

@@ -1,13 +1,14 @@
 
 import { Family } from '../../Definitions/Global/Families.js';
 import * as Insteon from '../../Devices/Insteon/index.js';
-import { MappingRegistry, type EndpointMapping, type FamilyToClusterMap } from '../../Model/ClusterMap.js';
+
 
 //import InsteonMap from "./Insteon.json";
 
 import { OnOffLightDevice, DimmableLightDevice } from '@matter/node/devices';
+import { add, MappingRegistry, type EndpointMapping, type FamilyToClusterMap } from './MappingRegistry.js';
 
-const map: FamilyToClusterMap<Family.Insteon> = {
+export const map: FamilyToClusterMap<Family.Insteon> = {
 	Family: Family.Insteon,
 
 	RelayLamp: {
@@ -15,11 +16,10 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 		mapping: {
 			OnOff: {
 				attributes: {
-					onOff: { driver: 'ST', converter: 'LevelFrom0To255.Boolean' }
+					onOff: { driver: 'ST', converter: 'Percent.Boolean' }
 				},
 				commands: { on: 'DON' }
 			}
-
 		}
 	},
 	RelayLampSwitch: {
@@ -27,12 +27,12 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 		mapping: {
 			OnOff: {
 				attributes: {
-					onOff: { driver: 'ST', converter: 'LevelFrom0To255.Boolean' }
+					onOff: { driver: 'ST', converter: 'Percent.Boolean' }
 				},
 				commands: { on: 'DON' }
 			}
 		}
-,},
+	},
 	DimmerLamp: {
 		deviceType: DimmableLightDevice,
 		// @ts-ignore
@@ -40,16 +40,16 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 			// @ts-ignore
 			OnOff: {
 				attributes: {
-					onOff: { driver: 'ST', converter: 'LevelFrom0To255.Boolean' }
+					onOff: { driver: 'ST', converter: 'Percent.Boolean' }
 				},
 				commands: { on: 'DON' }
 			},
 			LevelControl: {
 				// @ts-ignore
 				attributes: {
-					currentLevel: { driver: 'ST', converter: 'LevelFrom0To255.LightingLevel' },
-					startUpCurrentLevel: { driver: 'OL', converter: 'LevelFrom0To255.LightingLevel' },
-					onLevel: { driver: 'OL', converter: 'LevelFrom0To255.LightingLevel' }
+					currentLevel: { driver: 'ST', converter: 'Percent.LightingLevel' },
+					startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
+					onLevel: { driver: 'OL', converter: 'Percent.LightingLevel' }
 				},
 				commands: { setLevel: { command: 'DON' } }
 			}
@@ -59,20 +59,19 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 		deviceType: DimmableLightDevice,
 		// @ts-ignore
 		mapping: {
-
 			// @ts-ignore
 			OnOff: {
 				attributes: {
-					onOff: { driver: 'ST', converter: 'LevelFrom0To255.Boolean' }
+					onOff: { driver: 'ST', converter: 'Percent.Boolean' }
 				},
 				commands: { on: 'DON' }
 			},
 			LevelControl: {
 				// @ts-ignore
 				attributes: {
-					currentLevel: { driver: 'ST', converter: 'LevelFrom0To255.LightingLevel' },
-					startUpCurrentLevel: { driver: 'OL', converter: 'LevelFrom0To255.LightingLevel' },
-					onLevel: { driver: 'OL', converter: 'LevelFrom0To255.LightingLevel' }
+					currentLevel: { driver: 'ST', converter: 'Percent.LightingLevel' },
+					startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
+					onLevel: { driver: 'OL', converter: 'Percent.LightingLevel' }
 				},
 				commands: { setLevel: { command: 'DON' } }
 			}
@@ -80,5 +79,29 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 	}
 };
 
+/*let newMap = add(map, Insteon.DimmerLamp.Node, {
+	deviceType: DimmableLightDevice,
+	// @ts-ignore
+	mapping: {
+		// @ts-ignore
+		OnOff: {
+			attributes: {
+				onOff: { driver: 'ST', converter: 'Percent.Boolean' ,
+			},
+			commands: { on: 'DON' }
+		},
+		//@ts-ignore
+		LevelControl: {
+			// @ts-ignore
+			attributes: {
+				currentLevel: { driver: 'ST', converter: 'Percent.LightingLevel' },
+				startUpCurrentLevel: { driver: 'OL', converter: 'Percent.LightingLevel' },
+				onLevel: { driver: 'OL', converter: 'Percent.LightingLevel' }
+			},
+			commands: { setLevel: { command: 'DON' } }
+		}
+	}
+}});*/
+
 
 MappingRegistry.register(map);

package/src/{Model/ClusterMap.ts → Matter/Mappings/MappingRegistry.ts}

@@ -1,20 +1,21 @@
 import * as Clusters from '@project-chip/matter.js/cluster';
 
-import type { Converter } from '../Converters.js';
-import { DriverType } from '../Definitions/Global/Drivers.js';
-import { Devices, Insteon } from '../Devices/index.js';
+import type { Converter } from '../../Converters.js';
+import { DriverType } from '../../Definitions/Global/Drivers.js';
+import { Devices, Insteon } from '../../Devices/index.js';
 
 import { ClusterBehavior, MutableEndpoint, SupportedBehaviors } from '@matter/main';
 import type { OnOffLightDevice } from '@matter/main/devices';
 import { BridgedDeviceBasicInformationBehavior } from '@matter/node/behaviors';
 import type { DeviceTypeDefinition } from '@project-chip/matter.js/device';
-import { Family } from '../Definitions/index.js';
-import { NodeFactory } from '../Devices/NodeFactory.js';
-import { CommandsOf, DriversOf, ISYNode } from '../ISYNode.js';
-import { ISYBridgedDeviceBehavior } from '../Matter/Behaviors/ISYBridgedDeviceBehavior.js';
-import { ISYOnOffBehavior } from '../Matter/Behaviors/Insteon/ISYOnOffBehavior.js';
-import type { PickOfType, Remove } from '../Utils.js';
-import { ClusterType } from './ClusterType.js';
+import { Family } from '../../Definitions/index.js';
+import { NodeFactory } from '../../Devices/NodeFactory.js';
+import { CommandsOf, DriversOf, ISYNode } from '../../ISYNode.js';
+import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
+import { ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
+import type { PathsWithLimit, PickOfType, Remove } from '../../Utils.js';
+import { ClusterType } from '../../Model/ClusterType.js';
+import type { Constructor } from '../../Devices/Constructor.js';
 
 // #region Type aliases (16)
 
@@ -117,9 +118,20 @@ export type EndpointMapping1<A extends MutableEndpoint, K> = {
 	commands?: SBCommandMapping<A['behaviors'], K>;
 };
 //@ts-ignore
-export type FamilyToClusterMap<T extends Family.Insteon | Family.ZWave | Family.ZigBee> = { Family: T } & {
+
+type SupportedFamily = Family.Insteon | Family.ZWave | Family.ZigBee;
+export type FamilyToClusterMap<T extends SupportedFamily> = { Family: T } & {
 	[Type in Extract<keyof Devices.Insteon, `${string}Node`> as Remove<Type, 'Node'>]?: DeviceToClusterMap<InstanceType<Devices.Insteon[Type]>, MutableEndpoint>;
 };
+
+
+export function add<const F extends SupportedFamily, const T extends ISYNode<F>, const D extends MutableEndpoint> (familyToClusterMap: FamilyToClusterMap<F>, deviceClass: Constructor<T>,  mapping: DeviceToClusterMap<T, D> )
+{
+	 const map = {};
+	 map[deviceClass.name] = mapping;
+
+	 return {...map,...familyToClusterMap};
+}
 export type SBAttributeMapping<SB extends SupportedBehaviors, D> = {
 	[K in keyof SB]: Partial<Record<any, DriversOf<D> | { driver: DriversOf<D>; converter?: string }>>;
 };
@@ -149,7 +161,7 @@ export class MappingRegistry {
 
 	// #region Public Static Methods (3)
 
-	public static getMapping<T extends ISYNode<any, any, any, any>>(device: T): DeviceToClusterMap<T, MutableEndpoint> {
+	public static getMapping<const T extends ISYNode>(device: T): DeviceToClusterMap<T, MutableEndpoint> {
 		let m = this.cache[device.address];
 		if (!m) {
 			if (MappingRegistry.map.has(device.family)) {
@@ -180,7 +192,7 @@ export class MappingRegistry {
 		return m;
 	}
 
-	public static getMappingForBehavior<T extends ISYNode<any, any, any, any>, B extends ClusterBehavior>(device: T, behavior: B): BehaviorMapping<B, T> {
+	public static getMappingForBehavior<T extends ISYNode<any, any, any, any>, const B extends ClusterBehavior>(device: T, behavior: B): BehaviorMapping<B, T> {
 		//var m = MappingRegistry.getMapping(device);
 
 		//return m[behavior.cluster.name];
@@ -189,7 +201,7 @@ export class MappingRegistry {
 		}
 	}
 	//@ts-ignore
-	public static register(map: Partial<FamilyToClusterMap<any>> | { [x in Paths<typeof Devices>]: DeviceToClusterMap<any, any> }) {
+	public static register<const T extends Family.Insteon | Family.ZWave | Family.ZigBee>(map: Partial<FamilyToClusterMap<T>> | { [x in PathsWithLimit<typeof Devices,1>]: DeviceToClusterMap<any, any> }) {
 		if ('Family' in map) {
 			let regMap: Map<string, DeviceToClusterMap<any, any>>;
 			if (!MappingRegistry.map.has(map.Family)) {

package/src/Model/ClassDefinition.ts

@@ -136,6 +136,8 @@ function buildNodeClassDefinitions<T extends Family>(nodeDefs: NodeDef[], family
 	return map;
 }
 
+export type NCD = NodeClassDefinition<Family>;
+
 export class NodeClassDefinition<T extends Family> {
 	// #region Properties (11)
 
@@ -370,15 +372,17 @@ export class NodeClassDefinition<T extends Family> {
 }
 
 export type DataTypeDefinition =
-	| {
+	 {
 			uom: UnitOfMeasure;
 			serverUom?: UnitOfMeasure;
 			enum: false;
+			indexId?: string;
 			min: number;
 			max: number;
 			step?: number;
 			precision?: number;
-	  }
+			returnType?: string;
+	 }
 	| {
 			uom: UnitOfMeasure;
 			enum: true;
@@ -386,15 +390,15 @@ export type DataTypeDefinition =
 			values: {
 				[x: number]: string;
 			};
+			returnType?: string;
 	  };
 
 export abstract class NodeMemberDefinition<TId extends string> {
 	// #region Properties (7)
 
 	public classDef: NodeClassDefinition<any>;
-	public dataType: {
-		[x in keyof typeof UnitOfMeasure]?: DataTypeDefinition;
-	};
+	public dataType: DataTypeDefinition[];
+
 	public editorId: string;
 	public hidden: boolean;
 	public id: TId;
@@ -409,7 +413,7 @@ export abstract class NodeMemberDefinition<TId extends string> {
 		this.classDef = classDef;
 		if (def) {
 			this.editorId = def.editor;
-			this.dataType = {};
+			this.dataType = [];
 
 			var r = this.parseEditorId(def.editor);
 			if (r) this.applyEditorDef({ id: def.editor, range: r });
@@ -430,12 +434,13 @@ export abstract class NodeMemberDefinition<TId extends string> {
 
 	public applyEditorDef(e: EditorDef) {
 		if (e.id === this.editorId) {
-			var d = {};
+			var d = [];
 			for (const rangeDef of toArray(e.range)) {
+				let dt = {} as DataTypeDefinition;
 				if ('subset' in rangeDef) {
-					d[rangeDef.uom]= { uom: rangeDef.uom, indexId: rangeDef.nls, ...this.#parseSubset(e) };
+				 	dt = { uom: rangeDef.uom, indexId: rangeDef.nls, ...this.#parseSubset(e) };
 				} else {
-					d[rangeDef.uom] = {
+					dt = {
 						uom: rangeDef.uom,
 						enum: false,
 						min: rangeDef.min,
@@ -448,8 +453,9 @@ export abstract class NodeMemberDefinition<TId extends string> {
 				}
 				if(rangeDef.uom === UnitOfMeasure.Index)
 				{
-					d[rangeDef.uom].enum = true;
+					dt.enum = true;
 				}
+				d.push(dt);
 
 			}
 			this.dataType = d;